Request 3147 (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 3148 (Show diff)

Overview

Request 3147 (superseded)

New release

Created by mollekopf 12 months ago
In state superseded
Supersedes 3146
Superseded by 3148
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

@@ -34,10 +34,9 @@
 %endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
-%global upstream_version 2.4.2
 
 Name:           kolab-syncroton
-Version: 2.4.2.18
+Version:        2.4.0
 Release:        1%{?dist}
 Summary:        ActiveSync for Kolab Groupware
 
@@ -45,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
 
@@ -54,6 +53,7 @@
 %if 0%{?rhel} < 8
 %if 0%{?suse_version}
 BuildRequires:  roundcubemail
+Requires:       roundcubemail
 Requires:       php
 Requires:       php-pear-Auth_SASL
 Requires:       php-pear-MDB2_Driver_mysqli
@@ -61,6 +61,7 @@
 Requires:       php-pear-Net_Socket
 %else
 BuildRequires:  roundcubemail >= 1.5
+Requires:       roundcubemail >= 1.5
 Requires:       php-common >= 5.3
 Requires:       php-pear-Auth-SASL
 Requires:       php-pear-MDB2-Driver-mysqli
@@ -69,7 +70,6 @@
 %endif
 %endif
 
-Requires:       roundcubemail
 Requires:       logrotate
 %if 0%{?rhel} < 8
 Requires:       php-kolabformat
@@ -83,7 +83,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
@@ -172,18 +172,7 @@
     fi
 fi
 
-if  -f "/usr/lib/systemd/system/php-fpm.service" ; then
-    /bin/systemctl reload php-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 \
+/usr/share/roundcubemail/bin/updatedb.sh \
     --dir /usr/share/doc/kolab-syncroton/SQL/ \
     --package syncroton \
     >/dev/null 2>&1 || :
@@ -205,12 +194,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

buildtarball.sh Deleted

debian.changelog Changed

kolab-syncroton-2.4.2.tar.gz -> kolab-syncroton-2.4.0.tar.gz Changed

kolab-syncroton.dsc Changed

release.sh Deleted

Build Results
RPM Lint

Refresh

Comments for request 3147 0

Request History

mollekopf created request 12 months ago

New release

mollekopf superseded request 12 months ago

superseded by 3148