Request 65 (accepted)

Submit roundcubemail-plugin-composeaddressbook

Submit package home:vanm...elopment / roundcube...ressbook to package Kolab:Development / roundcubem...ddressbook

roundcubemail-plugin-composeaddressbook.spec Changed

@@ -1,3 +1,23 @@
+%{!?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
+%global httpd_user wwwrun
+%else
+%global httpd_group apache
+%global httpd_name httpd
+%global httpd_user apache
+%endif
+
+%global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
+
 %global roundcube %{_datadir}/roundcubemail
 %global roundcube_plugins %{roundcube}/plugins
 %global roundcube_conf %{_sysconfdir}/roundcubemail
@@ -41,12 +61,12 @@
 popd
 
 %post
-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
+%if [ -f "%{php_inidir}/apc.ini" ]; then
+    if [ ! -z "`grep ^apc.enabled=1 %{php_inidir}/apc.ini`" ]; then
+%if 0%{?with_systemd}
+        /sbin/systemctl condrestart %{httpd_name}.service
 %else
-    /sbin/service httpd condrestart
+        /sbin/service %{httpd_name} condrestart
 %endif
     fi
 fi
@@ -57,7 +77,7 @@
 %files
 %defattr(-,root,root,-)
 %dir %{roundcube_conf}
-%attr(0640,apache,apache) %config(noreplace) %{roundcube_conf}/*.php
+%attr(0640,root,%{httpd_group}) %config(noreplace) %{roundcube_conf}/*.php
 %dir %{roundcube}
 %dir %{roundcube_plugins}
 %{roundcube_plugins}/compose_addressbook

Build Results
RPM Lint

Refresh

Comments for request 65 0

Request History

vanmeeuwen created request over 11 years ago

Updated packaging for openSUSE wwwun over www

vanmeeuwen accepted request over 11 years ago

Overview

Request 65 (accepted)

Request History