From 5e06cd5c907ad3dd748ab6d5d099f9beb2abbc69 Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Thu, 25 Jul 2019 09:57:53 +0200
Subject: [PATCH] Prepare pre-release 2.11.0-0.rc1.1
---
.gitlab-ci.yml | 3 ++-
icinga2.spec | 12 ++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb4e2f7..b81e3df 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 9f24ca2..ea359b4 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
--
GitLab