Request 3212 (accepted)

This request supersedes: request 3209 (Show diff)

Overview

Request 3212 (accepted)

New release

Created by mollekopf 9 months ago
In state accepted
Supersedes 3209
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit libkolabxml

Submit package Kolab:16:Testing / libkolabxml to package Kolab:16 / libkolabxml

libkolabxml.spec Changed

@@ -176,6 +176,7 @@
 Requires:       plesk-php74-devel
 Requires:       plesk-php80-devel
 Requires:       plesk-php81-devel
+Requires:       plesk-php82-devel
 %endif
 %endif
 %if 0%{?with_python} > 0
@@ -269,6 +270,7 @@
 BuildRequires:  plesk-php74-devel
 BuildRequires:  plesk-php80-devel
 BuildRequires:  plesk-php81-devel
+BuildRequires:  plesk-php82-devel
 %endif
 
 %description -n php-kolabformat
@@ -329,6 +331,16 @@
 %description -n plesk-php81-kolabformat
 libkolabxml bindings for Plesk's PHP 8.1
 
+%package -n plesk-php82-kolabformat
+Summary:        libkolabxml bindings for Plesk's PHP 8.2
+Group:          System Environment/Libraries
+Provides:       php-bindings(libkolabxml) = %{version}-%{release}
+Requires:       libkolabxml%{?_isa} = %{version}
+Requires:       plesk-php82
+
+%description -n plesk-php82-kolabformat
+libkolabxml bindings for Plesk's PHP 8.2
+
 %endif # if 0%{?plesk}
 
 %if 0%{?with_python} > 0
@@ -393,6 +405,9 @@
 
 cp -a libkolabxml-%{version} libkolabxml-%{version}-8.1
 sed -i "s/-php/-php7/g" libkolabxml-%{version}-8.1/src/php/CMakeLists.txt
+
+cp -a libkolabxml-%{version} libkolabxml-%{version}-8.2
+sed -i "s/-php/-php7/g" libkolabxml-%{version}-8.2/src/php/CMakeLists.txt
 %endif
 
 %if 0%{?with_php7}
@@ -422,6 +437,7 @@
 cp %{name}-%{version}/tztable.h %{name}-%{version}-7.4/.
 cp %{name}-%{version}/tztable.h %{name}-%{version}-8.0/.
 cp %{name}-%{version}/tztable.h %{name}-%{version}-8.1/.
+cp %{name}-%{version}/tztable.h %{name}-%{version}-8.2/.
 %endif
 %if 0%{?with_python3} > 0
 cp %{name}-%{version}/tztable.h %{name}-%{version}-python3/.
@@ -510,9 +526,9 @@
 
 %if 0%{?plesk}
 %if 0%{?rhel} < 9
-for version in 7.2 7.3 7.4 8.0 8.1; do
+for version in 7.2 7.3 7.4 8.0 8.1 8.2; do
 %else
-for version in 7.4 8.0 8.1; do
+for version in 7.4 8.0 8.1 8.2; do
 %endif
     pushd %{name}-%{version}-${version}
     rm -rf build
@@ -567,9 +583,9 @@
 
 %if 0%{?plesk}
 %if 0%{?rhel} < 9
-for version in 7.2 7.3 7.4 8.0 8.1; do
+for version in 7.2 7.3 7.4 8.0 8.1 8.2; do
 %else
-for version in 7.4 8.0 8.1; do
+for version in 7.4 8.0 8.1 8.2; do
 %endif
     pushd %{name}-%{version}-${version}
     pushd build
@@ -614,9 +630,9 @@
 
 %if 0%{?plesk}
 %if 0%{?rhel} < 9
-for version in 7.2 7.3 7.4 8.0 8.1; do
+for version in 7.2 7.3 7.4 8.0 8.1 8.2; do
 %else
-for version in 7.4 8.0 8.1; do
+for version in 7.4 8.0 8.1 8.2; do
 %endif
 
     pushd %{name}-%{version}-${version}/build/
@@ -701,6 +717,12 @@
 /opt/plesk/php/8.1/etc/php.d/kolabformat.ini
 /opt/plesk/php/8.1/etc/php-fpm.d/kolabformat.ini
 
+%files -n plesk-php82-kolabformat
+%defattr(-,root,root,-)
+/opt/plesk/php/8.2/lib64/php/modules/kolabformat.so
+/opt/plesk/php/8.2/etc/php.d/kolabformat.ini
+/opt/plesk/php/8.2/etc/php-fpm.d/kolabformat.ini
+
 %endif # if 0%{?plesk}
 
 %endif # if 0%{?with_php}

debian.control Changed

debian.rules Changed

@@ -5,7 +5,7 @@
 PHPEXT := $(shell php-config --extension-dir)
 PHPINC := $(shell php-config --include-dir)
 
-PHP_VERSIONS=8.1 8.0 7.4 7.3 7.2
+PHP_VERSIONS=8.2 8.1 8.0 7.4 7.3 7.2
 
 export DH_VERBOSE=1
 export DH_OPTIONS=-v
@@ -14,7 +14,11 @@
 
 %:
 	python3 utils/zonetabconversion.py
-	dh $@ --parallel --with python2,python3 --buildsystem=pybuild
+	if  -f /usr/bin/python  ; then \
+        dh $@ --parallel --with python2,python3 --buildsystem=pybuild ; \
+    else \
+        dh $@ --parallel --with python3 --buildsystem=pybuild ; \
+    fi
 
 override_dh_gencontrol:
 	echo "php:Depends=phpapi-${PHPAPI}" >> debian/php-kolabformat.substvars
@@ -38,6 +42,15 @@
 			echo "debian/kolabformat.ini opt/plesk/php/$${version}/etc/php.d" >> debian/plesk-php$${shver}-kolabformat.install ; \
 		done ; \
 	fi
+	if  -f /usr/bin/python  ; then \
+        echo "" >> debian/control ; \
+        echo "Package: python-kolabformat" >> debian/control ; \
+        echo "Architecture: any" >> debian/control ; \
+        echo "Depends: libkolabxml1v5 (= ${binary:Version}), python, ${misc:Depends}, ${shlibs:Depends}" >> debian/control ; \
+        echo "Provides: php-bindings-libkolabxml" >> debian/control ; \
+        echo "Description: Python bindings for Kolab Format 3.0 XML parsing" >> debian/control ; \
+        echo "" >> debian/control ; \
+    fi
 
 	dh_gencontrol
 
@@ -126,7 +139,9 @@
 	mkdir -p debian/tmp/usr/share/php
 	make -C php-vanilla install DESTDIR=$(PWD)/debian/tmp/ ; \
 
-	if  -d "/etc/php/8.1/mods-available/" ; then \
+	if  -d "/etc/php/8.2/mods-available/" ; then \
+		echo "debian/kolabformat.ini etc/php/8.2/mods-available" >> debian/php-kolabformat.install ; \
+	elif  -d "/etc/php/8.1/mods-available/" ; then \
 		echo "debian/kolabformat.ini etc/php/8.1/mods-available" >> debian/php-kolabformat.install ; \
 	elif  -d "/etc/php/8.0/mods-available/" ; then \
 		echo "debian/kolabformat.ini etc/php/8.0/mods-available" >> debian/php-kolabformat.install ; \

libkolabxml.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3212 0

Request History

mollekopf created request 9 months ago

New release

mollekopf accepted request 9 months ago