Request 62 (accepted)

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.

Overview

Request 62 (accepted)

Updated packaging for openSUSE wwwun over www

Created by vanmeeuwen about 11 years ago
In state accepted

Submit kolab-syncroton

Submit package home:vanmee...Development / kolab-syncroton to package Kolab:Development / kolab-syncroton

kolab-syncroton.spec Changed

@@ -1,12 +1,19 @@
+%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
 
-%if 0%{?suse_version}
-%global _ap_sysconfdir %{_sysconfdir}/apache2
+f 0%{?suse_version}
+%global httpd_group www
+%global httpd_name apache2
+%global httpd_user wwwrun
 %else
-%global _ap_sysconfdir %{_sysconfdir}/httpd
+%global httpd_group apache
+%global httpd_name httpd
+%global httpd_user apache
 %endif
 
+%global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
+
 Name:           kolab-syncroton
-Version:        2.1.0
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        ActiveSync for Kolab Groupware
 
@@ -102,9 +109,9 @@
 if [ -f "%{php_inidir}/apc.ini" ]; then
     if [ ! -z "`grep ^apc.enabled=1 %{php_inidir}/apc.ini`" ]; then
 %if 0%{?fedora} > 15
-        /sbin/systemctl condrestart httpd.service
+        /sbin/systemctl condrestart %{httpd_name}.service
 %else
-        /sbin/service httpd condrestart
+        /sbin/service %{httpd_name} condrestart
 %endif
     fi
 fi
@@ -121,9 +128,12 @@
 %config(noreplace) %{_ap_sysconfdir}/conf.d/
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_datadir}/%{name}
-%attr(0770,apache,apache) %{_var}/log/%{name}
+%attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}
 
 %changelog
+* Sun Sep  8 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.2.0-1
+- Release version 2.2.0
+
 * Wed Sep  3 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.1.0-1
 - Bug fixes for #1658, and attachment sending

debian.changelog Changed

kolab-syncroton-2.1.0.tar.gz -> kolab-syncroton-2.2.0.tar.gz Changed

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 62 0

Request History

vanmeeuwen created request about 11 years ago

Updated packaging for openSUSE wwwun over www

vanmeeuwen accepted request about 11 years ago