From 9db220e54a203246fcf0c728d850accee82b66a6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Tue, 20 Jul 2021 16:27:54 +0200
Subject: [PATCH 1/3] Add missing php extension requirements

---
 icinga-php-thirdparty.spec | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/icinga-php-thirdparty.spec b/icinga-php-thirdparty.spec
index f46191a..f736784 100644
--- a/icinga-php-thirdparty.spec
+++ b/icinga-php-thirdparty.spec
@@ -13,10 +13,36 @@ URL:            https://icinga.com
 Source0:        https://github.com/Icinga/%{module_name}/archive/v%{version}.tar.gz
 BuildArch:      noarch
 
+# Define php runtime identifier
+%if 0%{?fedora} || 0%{?rhel} || 0%{?amzn}
+%if 0%{?rhel} == 7
+%define php_scl         rh-php73
+%endif
+
+%if 0%{?php_scl:1}
+%define php_scl_prefix  %{php_scl}-
+%endif
+
+%define php             %{?php_scl_prefix}php
+%endif
+
+%if 0%{?suse_version}
+%define php             php
+%endif
+
 %global basedir %{_datadir}/icinga-php/vendor
 
 Requires:       icinga-php-common
 
+# php extension requirements
+Requires:                   %{php}-soap
+Requires:                   %{php}-sockets
+Requires:                   %{php}-curl
+%{?suse_version:Requires:   %{php}-json}
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
+Requires:                   %{php}-json
+%endif
+
 %description
 This package bundles all 3rd party PHP libraries
 used by Icinga Web products into one piece,

From 723c1e6c213ee303ae13620697f83a17bebbf636 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Tue, 27 Jul 2021 08:57:41 +0200
Subject: [PATCH 2/3] Raise revision

---
 icinga-php-thirdparty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icinga-php-thirdparty.spec b/icinga-php-thirdparty.spec
index f736784..c3283a2 100644
--- a/icinga-php-thirdparty.spec
+++ b/icinga-php-thirdparty.spec
@@ -1,6 +1,6 @@
 # Icinga PHP Thirdparty for Icinga Web 2 | (c) 2021 Icinga GmbH | GPLv2+
 
-%global revision 1
+%global revision 2
 %global module_name icinga-php-thirdparty
 
 Name:           %{module_name}
@@ -68,5 +68,8 @@ rm -rf %{buildroot}
 %{basedir}
 
 %changelog
+* Tue Jul 27 2021 Johannes Meyer <johannes.meyer@icinga.com> - 0.10.0-2
+- Added missing php extension requirements
+
 * Thu Jul 08 2021 Henrik Triem <henrik.triem@icinga.com> - 0.10.0-1
 - Release 0.10.0

From c06d371d05e524f3b579334fdfc6a067059e69ab Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Wed, 17 Nov 2021 18:02:27 +0000
Subject: [PATCH 3/3] Add Fedora 35

---
 .gitlab-ci.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e313fae..1b40502 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,6 +81,23 @@ upload/epel/7:
 ###################################
 # Fedora
 ###################################
+build/fedora/35:
+  <<: *build
+  variables:
+    DOCKER_IMAGE: fedora/35
+
+test/fedora/35:
+  <<: *test
+  variables:
+    DOCKER_IMAGE: fedora/35
+  dependencies:
+  - build/fedora/35
+
+upload/fedora/35:
+  <<: *upload
+  dependencies:
+  - build/fedora/35
+
 build/fedora/34:
   <<: *build
   variables: