Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
packaging
rpm-icinga2
Commits
96e518e5
Commit
96e518e5
authored
Sep 19, 2019
by
Michael Friedrich
Browse files
Revert "Prepare pre-release 2.11.0-0.rc1.1"
This reverts commit
5e06cd5c
.
parent
5e06cd5c
Changes
2
Show whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
96e518e5
...
...
@@ -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
...
...
icinga2.spec
View file @
96e518e5
# 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 <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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment