Request 3213 (accepted)

You're not reviewing the full diff of request 3213 , but the diff to the superseded request 3210 (Show full diff)

Overview

Request 3213 (accepted)

New release

Created by mollekopf over 1 year ago
In state accepted
Supersedes 3210
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit libkolab

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

libkolab.spec Changed

@@ -178,17 +178,6 @@
 
 %description -n plesk-php81-kolab
 libkolab bindings for Plesk's PHP 8.1
-
-%package -n plesk-php82-kolab
-Summary:        libkolab bindings for Plesk's PHP 8.2
-Group:          System Environment/Libraries
-Provides:       php-bindings(libkolab) = %{version}-%{release}
-Requires:       libkolab%{?_isa} = %{version}
-Requires:       plesk-php82
-
-%description -n plesk-php82-kolab
-libkolab bindings for Plesk's PHP 8.2
-
 %endif
 
 %package -n python-kolab
@@ -241,9 +230,6 @@
 
 cp -a libkolab-%{version} libkolab-%{version}-8.1
 sed -i "s/-php/-php7/g" libkolab-%{version}-8.1/cmake/modules/SWIGUtils.cmake
-
-cp -a libkolab-%{version} libkolab-%{version}-8.2
-sed -i "s/-php/-php7/g" libkolab-%{version}-8.2/cmake/modules/SWIGUtils.cmake
 %endif
 
 %if 0%{?with_php7}
@@ -346,9 +332,9 @@
 
 %if 0%{?plesk}
 %if 0%{?rhel} < 9
-for version in 7.2 7.3 7.4 8.0 8.1 8.2; do
+for version in 7.2 7.3 7.4 8.0 8.1; do
 %else
-for version in 7.4 8.0 8.1 8.2; do
+for version in 7.4 8.0 8.1; do
 %endif
     pushd %{name}-%{version}-${version}
     rm -rf build
@@ -397,9 +383,9 @@
 
 %if 0%{?plesk}
 %if 0%{?rhel} < 9
-for version in 7.2 7.3 7.4 8.0 8.1 8.2; do
+for version in 7.2 7.3 7.4 8.0 8.1; do
 %else
-for version in 7.4 8.0 8.1 8.2; do
+for version in 7.4 8.0 8.1; do
 %endif
     pushd %{name}-%{version}-${version}
     pushd build
@@ -515,13 +501,6 @@
 /opt/plesk/php/8.1/lib64/php/modules/*.so
 /opt/plesk/php/8.1/etc/php.d/*.ini
 /opt/plesk/php/8.1/etc/php-fpm.d/*.ini
-
-%files -n plesk-php82-kolab
-%defattr(-,root,root,-)
-/opt/plesk/php/8.2/lib64/php/modules/*.so
-/opt/plesk/php/8.2/etc/php.d/*.ini
-/opt/plesk/php/8.2/etc/php-fpm.d/*.ini
-
 %endif
 
 %if 0%{?with_python} > 0

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.2 8.1 8.0 7.4 7.3 7.2
+PHP_VERSIONS=8.1 8.0 7.4 7.3 7.2
 
 export DH_VERBOSE=1
 export DH_OPTIONS=-v
@@ -13,11 +13,7 @@
 export DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed"
 
 %:
-	if  -f /usr/bin/python  ; then \
-        dh $@ --parallel --with python2,python3 --buildsystem=pybuild ; \
-    else \
-        dh $@ --parallel --with python3 --buildsystem=pybuild ; \
-    fi
+	dh $@ --parallel --with python2,python3 --buildsystem=pybuild
 
 override_dh_gencontrol:
 	echo "php:Depends=phpapi-${PHPAPI}" >> debian/php-kolab.substvars
@@ -42,17 +38,6 @@
 		done ; \
 	fi
 
-	if  -f /usr/bin/python  ; then \
-        echo "" >> debian/control ; \
-        echo "Package: python-kolab" >> debian/control ; \
-        echo "Architecture: any" >> debian/control ; \
-        echo "Section: python" >> debian/control ; \
-        echo "Depends: libkolab3 (= ${binary:Version}), {python:Depends}, ${misc:Depends}, ${shlibs:Depends}" >> debian/control ; \
-        echo "Conflicts: python-kolab-kde" >> debian/control ; \
-        echo "Description: Python bindings for Kolab library." >> debian/control ; \
-        echo "" >> debian/control ; \
-    fi
-
 	dh_gencontrol
 
 override_dh_auto_build:
@@ -140,9 +125,7 @@
 	echo "$(PHPEXT)" >> debian/php-kolab.install
 
 	# Put kolab.ini into place
-	if  -d "/etc/php/8.2/mods-available" ; then \
-		echo "debian/kolab.ini etc/php/8.2/mods-available" >> debian/php-kolab.install ; \
-	elif  -d "/etc/php/8.1/mods-available" ; then \
+	if  -d "/etc/php/8.1/mods-available" ; then \
 		echo "debian/kolab.ini etc/php/8.1/mods-available" >> debian/php-kolab.install ; \
 	elif  -d "/etc/php/8.0/mods-available" ; then \
 		echo "debian/kolab.ini etc/php/8.0/mods-available" >> debian/php-kolab.install ; \

libkolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3213 0

Request History

mollekopf created request over 1 year ago

New release

mollekopf accepted request over 1 year ago