Request 3212 (accepted)

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

Overview

Request 3212 (accepted)

New release

Created by mollekopf 10 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

@@ -68,7 +68,7 @@
 %else
 Name:           libkolabxml
 %endif
-Version:        1.3.1
+Version:        1.3.0
 Release:        1%{?dist}
 Summary:        Kolab XML format collection parser library
 
@@ -176,7 +176,6 @@
 Requires:       plesk-php74-devel
 Requires:       plesk-php80-devel
 Requires:       plesk-php81-devel
-Requires:       plesk-php82-devel
 %endif
 %endif
 %if 0%{?with_python} > 0
@@ -270,7 +269,6 @@
 BuildRequires:  plesk-php74-devel
 BuildRequires:  plesk-php80-devel
 BuildRequires:  plesk-php81-devel
-BuildRequires:  plesk-php82-devel
 %endif
 
 %description -n php-kolabformat
@@ -331,16 +329,6 @@
 %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
@@ -405,9 +393,6 @@
 
 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}
@@ -437,7 +422,6 @@
 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/.
@@ -526,9 +510,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
@@ -583,9 +567,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
@@ -630,9 +614,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}/build/
@@ -717,12 +701,6 @@
 /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.changelog Changed

debian.control Changed

@@ -21,10 +21,9 @@
                 plesk-php74-dev | bash,
                 plesk-php80-dev | bash,
                 plesk-php81-dev | bash,
-                plesk-php82-dev | bash,
                 psa | bash,
-                python2-dev | python-dev| python3-dev,
-                python-minimal | python2-minimal| python3-minimal,
+                python2-dev | python-dev,
+                python-minimal | python2-minimal,
                 python3-all-dev,
                 swig4.0 (>= 4.1),
                 xsdcxx
@@ -59,6 +58,19 @@
  .
  This package provides PHP bindings for libkolabxml
 
+Package: python-kolabformat
+Architecture: any
+Section: python
+Depends: libkolabxml1v5 (= ${binary:Version}),
+	python,
+	${misc:Depends},
+	${shlibs:Depends}
+Description: Python bindings for Kolab Format 3.0 XML parsing
+ Libkolabxml is the reference implementation of the Kolab XML format.
+ For more information see the libkolabxml package.
+ .
+ This package provides Python bindings for libkolabxml
+
 Package: python3-kolabformat
 Architecture: any
 Section: python

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
@@ -14,11 +14,7 @@
 
 %:
 	python3 utils/zonetabconversion.py
-	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-kolabformat.substvars
@@ -42,15 +38,6 @@
 			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
 
@@ -139,9 +126,7 @@
 	mkdir -p debian/tmp/usr/share/php
 	make -C php-vanilla install DESTDIR=$(PWD)/debian/tmp/ ; \
 
-	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 \
+	if  -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 ; \

debian.tar.gz/kolabformat.ini Changed

debian.tar.gz/php-kolabformat.postinst Changed

libkolabxml-1.3.1.tar.gz/CMakeLists.txt -> libkolabxml-1.3.0.tar.gz/CMakeLists.txt Changed

libkolabxml-1.3.1.tar.gz/tztable.h -> libkolabxml-1.3.0.tar.gz/tztable.h Changed

libkolabxml.dsc Changed

@@ -2,7 +2,7 @@
 Source: libkolabxml
 Binary: libkolabxml1v5, php-kolabformat, python-kolabformat, libkolabxml-dev
 Architecture: any
-Version: 1.3.1-0~kolab3
+Version: 1.3.0-0~kolab2
 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
 Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
 Homepage: http://git.kolab.org/libkolabxml
@@ -21,14 +21,13 @@
                 php-cgi,
                 php-dev,
                 psa | bash,
-                plesk-php72-dev | plesk-php73-dev | plesk-php74-dev | plesk-php80-dev | plesk-php81-dev | plesk-php82-dev | bash,
-                plesk-php73-dev | plesk-php74-dev | plesk-php80-dev | plesk-php81-dev | plesk-php82-dev | bash,
-                plesk-php74-dev | plesk-php80-dev | plesk-php81-dev | plesk-php82-dev | bash,
-                plesk-php80-dev | plesk-php81-dev | plesk-php82-dev | bash,
-                plesk-php81-dev | plesk-php82-dev | bash,
-                plesk-php82-dev | bash,
-                python2-dev | python-dev | python3-dev,
-                python-minimal | python2-minimal | python3-minimal,
+                plesk-php72-dev | plesk-php73-dev | plesk-php74-dev | plesk-php80-dev | plesk-php81-dev | bash,
+                plesk-php73-dev | plesk-php74-dev | plesk-php80-dev | plesk-php81-dev| bash,
+                plesk-php74-dev | plesk-php80-dev | plesk-php81-dev | bash,
+                plesk-php80-dev | plesk-php81-dev | bash,
+                plesk-php81-dev | bash,
+                python2-dev | python-dev,
+                python-minimal | python2-minimal,
                 python3-all-dev,
                 swig4.0 (>= 4.1),
                 xsdcxx
@@ -38,5 +37,5 @@
  php-kolabformat deb libs optional
  python-kolabformat deb python optional
 Files:
- 00000000000000000000000000000000 0 libkolabxml-1.3.1.tar.gz
+ 00000000000000000000000000000000 0 libkolabxml-1.3.0.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

Build Results
RPM Lint

Refresh

Comments for request 3212 0

Request History

mollekopf created request 10 months ago

New release

mollekopf accepted request 10 months ago