From 96e518e5efd18c3fcb4f79fef98f512979560e4d Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 19 Sep 2019 10:34:43 +0200 Subject: [PATCH] Revert "Prepare pre-release 2.11.0-0.rc1.1" This reverts commit 5e06cd5c907ad3dd748ab6d5d099f9beb2abbc69. --- .gitlab-ci.yml | 3 +-- icinga2.spec | 12 ++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b81e3df..fb4e2f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,7 @@ stages: variables: DOCKER_IMAGE_BASE: registry.icinga.com/build-docker - ICINGA_BUILD_RELEASE_TYPE: testing - #ICINGA_BUILD_TYPE: + ICINGA_BUILD_TYPE: snapshot #ICINGA_BUILD_UPSTREAM_BRANCH: .build: &build diff --git a/icinga2.spec b/icinga2.spec index ea359b4..9f24ca2 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -1,7 +1,6 @@ # Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ -%global revision 0.rc1.1 -%global src_version_suffix -rc1 +%define revision 1 # make sure that _rundir is working on older systems %if ! %{defined _rundir} @@ -98,10 +97,10 @@ License: GPLv2+ %endif # suse Group: System/Monitoring Name: icinga2 -Version: 2.11.0 +Version: 2.10.4 Release: %{revision}%{?dist} Url: https://www.icinga.com/ -Source: https://github.com/Icinga/%{name}/archive/v%{version}%{?src_version_suffix}.tar.gz +Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-bin = %{version}-%{release} @@ -335,7 +334,7 @@ Requires: nano Provides Nano syntax highlighting for icinga2. %prep -%setup -q -n %{name}-%{version}%{?src_version_suffix} +%setup -q -n %{name}-%{version} # 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' {} \; @@ -833,9 +832,6 @@ fi %{_datadir}/nano/%{name}.nanorc %changelog -* Thu Jul 25 2019 Markus Frosch 2.11.0-0.rc1.1 -- Prepare pre-release 2.11.0-rc1 - * Tue Mar 19 2019 Michael Friedrich 2.10.4-1 - Update to 2.10.4