Merge branch 'release/2.9.7-1' into support/2.9

.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
 
 variables:
   DOCKER_IMAGE_BASE: registry.icinga.com/build-docker
-  ICINGA_BUILD_TYPE: snapshot
+  #ICINGA_BUILD_TYPE: snapshot
   #ICINGA_BUILD_UPSTREAM_BRANCH:
 
 .build: &build
@@ -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:
@@ -105,57 +79,3 @@ upload/openSUSE/15.3:
   <<: *upload
   dependencies:
     - build/opensuse/15.3
-
-###################################
-# SLES
-###################################
-build/sles/15.3:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: sles/15.3
-
-test/sles/15.3:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: sles/15.3
-  dependencies:
-  - build/sles/15.3
-
-upload/SUSE/15.3:
-  <<: *upload
-  dependencies:
-  - build/sles/15.3
-
-build/sles/15.2:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: sles/15.2
-
-test/sles/15.2:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: sles/15.2
-  dependencies:
-    - build/sles/15.2
-
-upload/SUSE/15.2:
-  <<: *upload
-  dependencies:
-    - build/sles/15.2
-
-build/sles/12.5:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: sles/12.5
-
-test/sles/12.5:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: sles/12.5
-  dependencies:
-    - build/sles/12.5
-
-upload/SUSE/12.5:
-  <<: *upload
-  dependencies:
-    - build/sles/12.5

icingaweb2.spec

@@ -3,7 +3,7 @@
 %define revision 1
 
 Name:           icingaweb2
-Version:        2.9.6
+Version:        2.9.7
 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
@@ -80,7 +80,7 @@ Requires:                       icinga-l10n >= 1.1.0-1
 Requires:                       icingacli = %{version}-%{release}
 Requires:                       %{name}-common = %{version}-%{release}
 Requires:                       php-Icinga = %{version}-%{release}
-Requires:                       icinga-php-library >= 0.6.1-1
+Requires:                       icinga-php-library >= 0.8.0-1
 Requires:                       icinga-php-thirdparty >= 0.10.0-1
 Requires:                       %{name}-vendor-dompdf = %{version}-%{release}
 Requires:                       %{name}-vendor-HTMLPurifier = 1:%{version}-%{release}
@@ -144,7 +144,7 @@ Group:                      Applications/System
 Requires:                   icinga-l10n >= 1.1.0-1
 Requires:                   %{name}-common = %{version}-%{release}
 Requires:                   php-Icinga = %{version}-%{release}
-Requires:                   icinga-php-library >= 0.6.0-1
+Requires:                   icinga-php-library >= 0.8.0-1
 Requires:                   icinga-php-thirdparty >= 0.10.0-1
 Requires:                   bash-completion
 Requires:                   %{php_cli} >= %{php_version}
@@ -429,6 +429,9 @@ fi
 %{basedir}/library/vendor/Zend
 
 %changelog
+* Thu Jun 30 2022 Eric Lippmann <eric.lippmann@icinga.com> 2.9.7-1
+- Update to 2.9.7
+
 * Tue Mar 08 2022 Johannes Meyer <johannes.meyer@icinga.com> 2.9.6-1
 - Update to 2.9.6