Request 3109 (superseded)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

This request is superseded by request 3114 (Show diff)

Overview

Request 3109 (superseded)

php8 fixes

Created by mollekopf over 1 year ago
In state superseded
Superseded by 3114
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit kolab-syncroton

Submit package Kolab:16:Testing / kolab-syncroton to package Kolab:16 / kolab-syncroton

kolab-syncroton.spec Changed

@@ -17,12 +17,6 @@
 
 %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
 
-%if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
-%global with_systemd 0
-%else
-%global with_systemd 1
-%endif
-
 %if 0%{?suse_version}
 %global httpd_group www
 %global httpd_name apache2
@@ -40,10 +34,9 @@
 %endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
-%global upstream_version 2.4.2
 
 Name:           kolab-syncroton
-Version: 2.4.2.36
+Version:        2.3.22
 Release:        1%{?dist}
 Summary:        ActiveSync for Kolab Groupware
 
@@ -51,7 +44,7 @@
 License:        LGPLv2
 URL:            http://www.syncroton.org
 
-Source0:        %{name}-%{upstream_version}.tar.gz
+Source0:        https://mirror.kolabenterprise.com/pub/releases/%{name}-%{version}.tar.gz
 Source1:        kolab-syncroton.logrotate
 Source2:        plesk.kolab_syncroton.inc.php
 
@@ -75,7 +68,6 @@
 %endif
 %endif
 
-Requires:       roundcubemail
 Requires:       logrotate
 %if 0%{?rhel} < 8
 Requires:       php-kolabformat
@@ -89,7 +81,7 @@
 and Tasks though this package - based on Syncroton technology.
 
 %prep
-%setup -q -n %{name}-%{upstream_version}
+%setup -q -n %{name}-%{version}
 #%patch0 -p1
 
 %build
@@ -112,7 +104,6 @@
 
 cp -a lib %{buildroot}/%{_datadir}/%{name}/.
 cp -a index.php %{buildroot}/%{_datadir}/%{name}/.
-cp -a bin %{buildroot}/%{_datadir}/%{name}/.
 
 %if 0%{?plesk}
 cp -a %SOURCE2 %{buildroot}/%{_sysconfdir}/roundcubemail/kolab_syncroton.inc.php
@@ -171,7 +162,7 @@
 %post
 if  -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ; then
     if  ! -z "`grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null`" ; then
-%if 0%{?with_systemd}
+%if 0%{?fedora} > 15
         /bin/systemctl condrestart %{httpd_name}.service
 %else
         /sbin/service %{httpd_name} condrestart
@@ -179,40 +170,8 @@
     fi
 fi
 
-if  -f "/usr/lib/systemd/system/php-fpm.service" ; then
-    /bin/systemctl reload php-fpm.service || :
-fi
-
-if  -f "/usr/lib/systemd/system/plesk-php74-fpm.service" ; then
-    /bin/systemctl reload plesk-php74-fpm.service || :
-fi
-
-if  -f "/usr/lib/systemd/system/plesk-php80-fpm.service" ; then
-    /bin/systemctl reload plesk-php80-fpm.service || :
-fi
-
-if  -f "/usr/lib/systemd/system/plesk-php81-fpm.service" ; then
-    /bin/systemctl reload plesk-php81-fpm.service || :
-fi
-
-if  -f "/usr/lib/systemd/system/plesk-php82-fpm.service" ; then
-    /bin/systemctl reload plesk-php82-fpm.service || :
-fi
-
-if  -f "/usr/lib/systemd/system/plesk-php83-fpm.service" ; then
-    /bin/systemctl reload plesk-php83-fpm.service || :
-fi
-
-
-
-%if 0%{?plesk} > 0 && 0%{?rhel} == 7
-php="/opt/plesk/php/7.4/bin/php"
-%else
-php="/usr/bin/php"
-%endif
-
-${php} /usr/share/roundcubemail/bin/updatedb.sh \
-    --dir /usr/share/doc/kolab-syncroton/SQL/ \
+/usr/share/roundcubemail/bin/updatedb.sh \
+    --dir /usr/share/doc/kolab-syncroton-%{version}/SQL/ \
     --package syncroton \
     >/dev/null 2>&1 || :
 
@@ -233,15 +192,6 @@
 %attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}
 
 %changelog
-* Thu Jul 27 2023 Christian Mollekopf <mollekopf@apheleia-it.ch> - 2.4.2-1
-- Release version 2.4.2
-
-* Mon Jul 17 2023 Christian Mollekopf <mollekopf@apheleia-it.ch> - 2.4.1-1
-- Release version 2.4.1
-
-* Wed May 10 2023 Christian Mollekopf <mollekopf@apheleia-it.ch> - 2.4.0-1
-- Release version 2.4.0
-
 * Fri Feb 04 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 2.3.22-1
 - Release version 2.3.22