tyler.durden/rpm-icinga2
1
0
Fork 0
mirror of https://git.icinga.com/packaging/rpm-icinga2.git synced 2025-09-26 03:19:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prepare pre-release 2.11.0-0.rc1.1

Browse Source
This commit is contained in:
Markus Frosch 2019-07-25 09:57:53 +02:00
parent bb86f6bafe
commit 5e06cd5c90
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -5,7 +5,8 @@ stages:
variables: variables:
DOCKER_IMAGE_BASE: registry.icinga.com/build-docker DOCKER_IMAGE_BASE: registry.icinga.com/build-docker
ICINGA_BUILD_TYPE: snapshot ICINGA_BUILD_RELEASE_TYPE: testing
#ICINGA_BUILD_TYPE:
#ICINGA_BUILD_UPSTREAM_BRANCH: #ICINGA_BUILD_UPSTREAM_BRANCH:
.build: &build .build: &build

12
icinga2.spec
View File

@ -1,6 +1,7 @@
# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ # Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
%define revision 1 %global revision 0.rc1.1
%global src_version_suffix -rc1
# make sure that _rundir is working on older systems # make sure that _rundir is working on older systems
%if ! %{defined _rundir} %if ! %{defined _rundir}
@ -97,10 +98,10 @@ License: GPLv2+
%endif # suse %endif # suse
Group: System/Monitoring Group: System/Monitoring
Name: icinga2 Name: icinga2
Version: 2.10.4 Version: 2.11.0
Release: %{revision}%{?dist} Release: %{revision}%{?dist}
Url: https://www.icinga.com/ Url: https://www.icinga.com/
Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz Source: https://github.com/Icinga/%{name}/archive/v%{version}%{?src_version_suffix}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-bin = %{version}-%{release}
@ -334,7 +335,7 @@ Requires: nano
Provides Nano syntax highlighting for icinga2. Provides Nano syntax highlighting for icinga2.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}%{?src_version_suffix}
# use absolute shebang instead of env on SUSE distributions # use absolute shebang instead of env on SUSE distributions
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
find . -type f -name '*.sh' -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} \; find . -type f -name '*.sh' -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} \;
@ -832,6 +833,9 @@ fi
%{_datadir}/nano/%{name}.nanorc %{_datadir}/nano/%{name}.nanorc
%changelog %changelog
* Thu Jul 25 2019 Markus Frosch <markus.frosch@icinga.com> 2.11.0-0.rc1.1
- Prepare pre-release 2.11.0-rc1
* Tue Mar 19 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.10.4-1 * Tue Mar 19 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.10.4-1
- Update to 2.10.4 - Update to 2.10.4