Request 3197 (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 3198 (Show diff)

Overview

Request 3197 (superseded)

New release 2.4.2.2

Created by mollekopf over 1 year ago
In state superseded
Superseded by 3198
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.39
+Version: 2.4.2.1
 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:        %{name}-%{version}.tar.gz
 Source1:        kolab-syncroton.logrotate
 Source2:        plesk.kolab_syncroton.inc.php
 
@@ -89,7 +82,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 +105,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 +163,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,48 +171,10 @@
     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} <= 8
-for version in 8.2 8.1 8.0 7.4; do
-    php="/opt/plesk/php/$version/bin/php"
-%else
-for version in 1; do
-    php="/usr/bin/php"
-%endif
-
-    if  -f "$php" ; then
-        ${php} /usr/share/roundcubemail/bin/updatedb.sh \
-            --dir /usr/share/doc/kolab-syncroton/SQL/ \
-            --package syncroton \
-            >/dev/null 2>&1 || :
-        break
-    fi
-done
+/usr/share/roundcubemail/bin/updatedb.sh \
+    --dir /usr/share/doc/kolab-syncroton/SQL/ \
+    --package syncroton \
+    >/dev/null 2>&1 || :
 
 exit 0

debian.changelog Changed

debian.tar.gz/dirs Changed

debian.tar.gz/install Changed

kolab-syncroton-2.4.2.tar.gz Changed

kolab-syncroton.dsc Changed

release.sh Deleted

Build Results
RPM Lint

Refresh

Comments for request 3197 0

Request History

mollekopf created request over 1 year ago

New release 2.4.2.2

mollekopf superseded request over 1 year ago

superseded by 3198