Merge branch 'release/2.10.3' into support/2.10

This commit is contained in:
Eric Lippmann 2022-06-30 13:40:50 +02:00
commit f34cbca749
2 changed files with 10 additions and 30 deletions

View File

@ -46,9 +46,6 @@ variables:
- master
- tags
###################################
# EPEL
###################################
build/centos/7:
<<: *build
variables:
@ -66,29 +63,6 @@ upload/centos/7:
dependencies:
- build/centos/7
###################################
# Fedora
###################################
build/fedora/34:
<<: *build
variables:
DOCKER_IMAGE: fedora/34
test/fedora/34:
<<: *test
variables:
DOCKER_IMAGE: fedora/34
dependencies:
- build/fedora/34
upload/fedora/34:
<<: *upload
dependencies:
- build/fedora/34
###################################
# openSUSE
###################################
build/opensuse/15.3:
<<: *build
variables:
@ -99,9 +73,9 @@ test/opensuse/15.3:
variables:
DOCKER_IMAGE: opensuse/15.3
dependencies:
- build/opensuse/15.3
- build/opensuse/15.3
upload/openSUSE/15.3:
<<: *upload
dependencies:
- build/opensuse/15.3
- build/opensuse/15.3

View File

@ -3,7 +3,7 @@
%define revision 1
Name: icingaweb2
Version: 2.10.1
Version: 2.10.3
Release: %{revision}%{?dist}
Summary: Icinga Web 2
Group: Applications/System
@ -12,7 +12,7 @@ URL: https://icinga.com
Source0: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Packager: Icinga Team <info@icinga.com>
Packager: Icinga GmbH <info@icinga.com>
%if 0%{?fedora} || 0%{?rhel} || 0%{?amzn}
%if 0%{?rhel} == 7
@ -428,6 +428,12 @@ fi
%{basedir}/library/vendor/Zend
%changelog
* Thu Jun 30 2022 Eric Lippmann <eric.lippmann@icinga.com> 2.10.3-1
- Update to 2.10.3
* Thu Jun 30 2022 Eric Lippmann <eric.lippmann@icinga.com> 2.10.2-1
- Update to 2.10.2
* Wed Apr 06 2022 Johannes Meyer <johannes.meyer@icinga.com> 2.10.1-1
- Update to 2.10.1