Kolab Groupware OBS

Changes of Revision 3

libkolabxml.spec Changed

@@ -169,14 +169,11 @@
 %if 0%{?with_php} > 0
 Requires:       php-devel >= 5.3
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-Requires:       plesk-php56-devel
-Requires:       plesk-php70-devel
-%endif
-Requires:       plesk-php71-devel
 Requires:       plesk-php72-devel
 Requires:       plesk-php73-devel
 Requires:       plesk-php74-devel
+Requires:       plesk-php80-devel
+Requires:       plesk-php81-devel
 %endif
 %endif
 %if 0%{?with_python} > 0
@@ -264,14 +261,11 @@
 BuildRequires:  php >= 5.3
 BuildRequires:  php-devel >= 5.3
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-BuildRequires:  plesk-php56-devel
-BuildRequires:  plesk-php70-devel
-%endif
-BuildRequires:  plesk-php71-devel
 BuildRequires:  plesk-php72-devel
 BuildRequires:  plesk-php73-devel
 BuildRequires:  plesk-php74-devel
+BuildRequires:  plesk-php80-devel
+BuildRequires:  plesk-php81-devel
 %endif
 
 %description -n php-kolabformat
@@ -280,38 +274,6 @@
 %endif
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-%package -n plesk-php56-kolabformat
-Summary:        libkolabxml bindings for Plesk's PHP 5.6
-Group:          System Environment/Libraries
-Provides:       php-bindings(libkolabxml) = %{version}-%{release}
-Requires:       libkolabxml%{?_isa} = %{version}
-Requires:       plesk-php56
-
-%description -n plesk-php56-kolabformat
-libkolabxml bindings for Plesk's PHP 5.6
-
-%package -n plesk-php70-kolabformat
-Summary:        libkolabxml bindings for Plesk's PHP 7.0
-Group:          System Environment/Libraries
-Provides:       php-bindings(libkolabxml) = %{version}-%{release}
-Requires:       libkolabxml%{?_isa} = %{version}
-Requires:       plesk-php70
-
-%description -n plesk-php70-kolabformat
-libkolabxml bindings for Plesk's PHP 7.0
-%endif
-
-%package -n plesk-php71-kolabformat
-Summary:        libkolabxml bindings for Plesk's PHP 7.1
-Group:          System Environment/Libraries
-Provides:       php-bindings(libkolabxml) = %{version}-%{release}
-Requires:       libkolabxml%{?_isa} = %{version}
-Requires:       plesk-php71
-
-%description -n plesk-php71-kolabformat
-libkolabxml bindings for Plesk's PHP 7.1
-
 %package -n plesk-php72-kolabformat
 Summary:        libkolabxml bindings for Plesk's PHP 7.2
 Group:          System Environment/Libraries
@@ -410,16 +372,6 @@
 %endif
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-cp -a libkolabxml-%{version} libkolabxml-%{version}-5.6
-
-cp -a libkolabxml-%{version} libkolabxml-%{version}-7.0
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.0/src/php/CMakeLists.txt
-%endif
-
-cp -a libkolabxml-%{version} libkolabxml-%{version}-7.1
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.1/src/php/CMakeLists.txt
-
 cp -a libkolabxml-%{version} libkolabxml-%{version}-7.2
 sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.2/src/php/CMakeLists.txt
 
@@ -430,10 +382,10 @@
 sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.4/src/php/CMakeLists.txt
 
 cp -a libkolabxml-%{version} libkolabxml-%{version}-8.0
-sed -i "s/-php/-php8/g" libkolabxml-%{version}-8.0/src/php/CMakeLists.txt
+sed -i "s/-php/-php7/g" libkolabxml-%{version}-8.0/src/php/CMakeLists.txt
 
 cp -a libkolabxml-%{version} libkolabxml-%{version}-8.1
-sed -i "s/-php/-php8/g" libkolabxml-%{version}-8.1/src/php/CMakeLists.txt
+sed -i "s/-php/-php7/g" libkolabxml-%{version}-8.1/src/php/CMakeLists.txt
 %endif
 
 %if 0%{?with_php7}
@@ -456,11 +408,6 @@
 popd
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-cp %{name}-%{version}/tztable.h %{name}-%{version}-5.6/.
-cp %{name}-%{version}/tztable.h %{name}-%{version}-7.0/.
-%endif
-cp %{name}-%{version}/tztable.h %{name}-%{version}-7.1/.
 cp %{name}-%{version}/tztable.h %{name}-%{version}-7.2/.
 cp %{name}-%{version}/tztable.h %{name}-%{version}-7.3/.
 cp %{name}-%{version}/tztable.h %{name}-%{version}-7.4/.
@@ -553,11 +500,7 @@
 
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-for version in 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do
-%else
-for version in 7.1 7.2 7.3 7.4 8.0 8.1; do
-%endif
+for version in 7.2 7.3 7.4 8.0 8.1; do
     pushd %{name}-%{version}-${version}
     rm -rf build
     mkdir -p build
@@ -595,7 +538,6 @@
 mkdir -p \
     %{buildroot}/%{_datadir}/%{php} \
     %{buildroot}/%{php_inidir}/
-mv %{buildroot}/%{php_extdir}/kolabformat.php %{buildroot}/%{_datadir}/%{php}/kolabformat.php
 cat > %{buildroot}/%{php_inidir}/kolabformat.ini << EOF
 extension=kolabformat.so
 EOF
@@ -611,11 +553,7 @@
 %endif
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-for version in 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do
-%else
-for version in 7.1 7.2 7.3 7.4 8.0 8.1; do
-%endif
+for version in 7.2 7.3 7.4 8.0 8.1; do
     pushd %{name}-%{version}-${version}
     pushd build
     make install DESTDIR=%{buildroot} INSTALL='install -p'
@@ -626,10 +564,6 @@
         %{buildroot}/opt/plesk/php/${version}/etc/php.d/ \
         %{buildroot}/opt/plesk/php/${version}/etc/php-fpm.d/
 
-    mv \
-        %{buildroot}/opt/plesk/php/${version}/lib64/php/modules/kolabformat.php \
-        %{buildroot}/opt/plesk/php/${version}/share/php/kolabformat.php
-
     echo "extension=kolabformat.so" > %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolabformat.ini
     cp %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolabformat.ini \
         %{buildroot}/opt/plesk/php/${version}/etc/php-fpm.d/
@@ -662,11 +596,7 @@
 %endif
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-for version in 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do
-%else
-for version in 7.1 7.2 7.3 7.4 8.0 8.1; do
-%endif
+for version in 7.2 7.3 7.4 8.0 8.1; do
     pushd %{name}-%{version}-${version}/build/
     export LD_LIBRARY_PATH=$( pwd )/src/
     /opt/plesk/php/${version}/bin/php -d enable_dl=On -dextension=src/php/kolabformat.so src/php/test.php ||:
@@ -713,66 +643,37 @@
 %if 0%{?with_php} > 0
 %files -n php-kolabformat
 %defattr(-,root,root,-)
-%{_datadir}/%{php}/kolabformat.php
 %{php_extdir}/kolabformat.so
 %config(noreplace) %{php_inidir}/kolabformat.ini
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-%files -n plesk-php56-kolabformat
-%defattr(-,root,root,-)
-/opt/plesk/php/5.6/lib64/php/modules/kolabformat.so
-/opt/plesk/php/5.6/share/php/kolabformat.php
-/opt/plesk/php/5.6/etc/php.d/kolabformat.ini
-/opt/plesk/php/5.6/etc/php-fpm.d/kolabformat.ini
-
-%files -n plesk-php70-kolabformat
-%defattr(-,root,root,-)
-/opt/plesk/php/7.0/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.0/share/php/kolabformat.php
-/opt/plesk/php/7.0/etc/php.d/kolabformat.ini
-/opt/plesk/php/7.0/etc/php-fpm.d/kolabformat.ini
-%endif
-
-%files -n plesk-php71-kolabformat
-%defattr(-,root,root,-)
-/opt/plesk/php/7.1/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.1/share/php/kolabformat.php
-/opt/plesk/php/7.1/etc/php.d/kolabformat.ini
-/opt/plesk/php/7.1/etc/php-fpm.d/kolabformat.ini
-
 %files -n plesk-php72-kolabformat
 %defattr(-,root,root,-)
 /opt/plesk/php/7.2/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.2/share/php/kolabformat.php
 /opt/plesk/php/7.2/etc/php.d/kolabformat.ini
 /opt/plesk/php/7.2/etc/php-fpm.d/kolabformat.ini
 
 %files -n plesk-php73-kolabformat
 %defattr(-,root,root,-)
 /opt/plesk/php/7.3/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.3/share/php/kolabformat.php
 /opt/plesk/php/7.3/etc/php.d/kolabformat.ini
 /opt/plesk/php/7.3/etc/php-fpm.d/kolabformat.ini
 
 %files -n plesk-php74-kolabformat
 %defattr(-,root,root,-)
 /opt/plesk/php/7.4/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.4/share/php/kolabformat.php
 /opt/plesk/php/7.4/etc/php.d/kolabformat.ini
 /opt/plesk/php/7.4/etc/php-fpm.d/kolabformat.ini
 
 %files -n plesk-php80-kolabformat
 %defattr(-,root,root,-)
 /opt/plesk/php/8.0/lib64/php/modules/kolabformat.so
-/opt/plesk/php/8.0/share/php/kolabformat.php
 /opt/plesk/php/8.0/etc/php.d/kolabformat.ini
 /opt/plesk/php/8.0/etc/php-fpm.d/kolabformat.ini
 
 %files -n plesk-php81-kolabformat
 %defattr(-,root,root,-)
 /opt/plesk/php/8.1/lib64/php/modules/kolabformat.so
-/opt/plesk/php/8.1/share/php/kolabformat.php
 /opt/plesk/php/8.1/etc/php.d/kolabformat.ini
 /opt/plesk/php/8.1/etc/php-fpm.d/kolabformat.ini

debian.rules Changed

@@ -5,7 +5,7 @@
 PHPEXT := $(shell php-config --extension-dir)
 PHPINC := $(shell php-config --include-dir)
 
-PHP_VERSIONS=7.4 7.3 7.2 7.1 7.0 5.6
+PHP_VERSIONS=8.1 8.0 7.4 7.3 7.2 7.1 7.0 5.6
 
 export DH_VERBOSE=1
 export DH_OPTIONS=-v
@@ -128,7 +128,11 @@
 	make -C php-vanilla install DESTDIR=$(PWD)/debian/tmp/ ; \
 	mv -v debian/tmp/usr/lib/php*/$(PHPAPI)/kolabformat.php debian/tmp/usr/share/php/kolabformat.php
 
-	if  -d "/etc/php/7.4/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 ; \
+	elif  -d "/etc/php/7.4/mods-available/" ; then \
 		echo "debian/kolabformat.ini etc/php/7.4/mods-available" >> debian/php-kolabformat.install ; \
 	elif  -d "/etc/php/7.3/mods-available/" ; then \
 		echo "debian/kolabformat.ini etc/php/7.3/mods-available" >> debian/php-kolabformat.install ; \