diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb4e2f7ace2d7310e53690ab3bef50a5c96496a4..b81e3df5c23992b09c3bc750e50b77856b042e4a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,8 @@ stages: variables: DOCKER_IMAGE_BASE: registry.icinga.com/build-docker - ICINGA_BUILD_TYPE: snapshot + ICINGA_BUILD_RELEASE_TYPE: testing + #ICINGA_BUILD_TYPE: #ICINGA_BUILD_UPSTREAM_BRANCH: .build: &build diff --git a/icinga2.spec b/icinga2.spec index 9f24ca2c9a4cfa77f5a946de41379a26714e6fcd..ea359b4faca9786a730c8d7ea2a1a263a34c8ba1 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -1,6 +1,7 @@ # 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 %if ! %{defined _rundir} @@ -97,10 +98,10 @@ License: GPLv2+ %endif # suse Group: System/Monitoring Name: icinga2 -Version: 2.10.4 +Version: 2.11.0 Release: %{revision}%{?dist} 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 Requires: %{name}-bin = %{version}-%{release} @@ -334,7 +335,7 @@ Requires: nano Provides Nano syntax highlighting for icinga2. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}%{?src_version_suffix} # use absolute shebang instead of env on SUSE distributions %if "%{_vendor}" == "suse" 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 %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 - Update to 2.10.4