From e74d22404e1af67408772f0b437d612227014ea7 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 7 Jun 2022 16:01:46 +0200 Subject: [PATCH 1/5] It's the Icinga GmbH now --- icingaweb2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icingaweb2.spec b/icingaweb2.spec index f244181..ead8bcd 100644 --- a/icingaweb2.spec +++ b/icingaweb2.spec @@ -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 +Packager: Icinga GmbH %if 0%{?fedora} || 0%{?rhel} || 0%{?amzn} %if 0%{?rhel} == 7 From 17119b85018e23eee022542c6158bb425710355f Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 30 Jun 2022 10:16:20 +0200 Subject: [PATCH 2/5] Update build targets --- .gitlab-ci.yml | 84 ++------------------------------------------------ 1 file changed, 2 insertions(+), 82 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2d52bb..810c4cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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,63 +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 - -################################### -# 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 + - build/opensuse/15.3 From 294b67b1e87ebe8bc559901dd28fcc646d09c149 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 30 Jun 2022 10:17:35 +0200 Subject: [PATCH 3/5] Raise version to 2.9.7-1 --- icingaweb2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/icingaweb2.spec b/icingaweb2.spec index ead8bcd..0cd1fdd 100644 --- a/icingaweb2.spec +++ b/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 @@ -429,6 +429,9 @@ fi %{basedir}/library/vendor/Zend %changelog +* Thu Jun 30 2022 Eric Lippmann 2.9.7-1 +- Update to 2.9.7 + * Tue Mar 08 2022 Johannes Meyer 2.9.6-1 - Update to 2.9.6 From 41282f58e653a1609ef0bb210cd3c385fbfb5fe9 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 30 Jun 2022 10:25:16 +0200 Subject: [PATCH 4/5] Don't build snapshots --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 810c4cb..91ebda9 100644 --- a/.gitlab-ci.yml +++ b/.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 From aad5622a74866a7d55cad6ba713dfbaa5fee6de0 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 30 Jun 2022 11:52:24 +0200 Subject: [PATCH 5/5] Update requirements --- icingaweb2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icingaweb2.spec b/icingaweb2.spec index 0cd1fdd..e7b14c4 100644 --- a/icingaweb2.spec +++ b/icingaweb2.spec @@ -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}