Request 490 (accepted)

Overview

Request 490 (accepted)

Fix Kolab#2935

Created by ajaissle over 9 years ago
In state accepted
Open review for Kolab:3.2:Updates / chwala

Submit chwala

Submit package Kolab:3.2:Updates / chwala to package Kolab:3.1:Updates / chwala

chwala.spec Changed

@@ -32,14 +32,17 @@
 
 Name:           chwala
 Version:        0.2
-Release:	    1%{?dist}
+Release:        4%{?dist}
 Summary:        Glorified WebDAV, done right
 
 Group:          Applications/Internet
 License:        AGPLv3+
 URL:            http://chwala.org
 Source0:        http://mirror.kolabsys.com/pub/releases/chwala-%{version}.tar.gz
-Source1:        chwala.conf
+Source2:        chwala.logrotate
+
+Patch1:         chwala-0.2-suhosin.session.encrypt-php_flag.patch
+Patch2:         chwala-0.2-support-recent-libkolab-changes.patch
 
 BuildArch:      noarch
 
@@ -67,6 +70,9 @@
 %prep
 %setup -q
 
+%patch1 -p1
+%patch2 -p1
+
 %build
 
 %install
@@ -77,7 +83,10 @@
     %{buildroot}/%{_localstatedir}/lib/%{name} \
     %{buildroot}/%{_localstatedir}/log/%{name}
 
-install -pm 644 %{SOURCE1} %{buildroot}/%{_ap_sysconfdir}/conf.d/chwala.conf
+install -pm 644 doc/chwala.conf %{buildroot}/%{_ap_sysconfdir}/conf.d/chwala.conf
+
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+cp -pr %SOURCE2 %{buildroot}%{_sysconfdir}/logrotate.d/chwala
 
 cp -a lib public_html %{buildroot}/usr/share/%{name}
 
@@ -110,7 +119,7 @@
 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
+        /bin/systemctl condrestart %{httpd_name}.service
 %else
         /sbin/service %{httpd_name} condrestart
 %endif
@@ -120,12 +129,23 @@
 %files
 %doc README.md LICENSE
 %{_ap_sysconfdir}/conf.d/%{name}.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_datadir}/%{name}
 %attr(0750,%{httpd_user},%{httpd_group}) %{_localstatedir}/cache/%{name}
 %attr(0750,%{httpd_user},%{httpd_group}) %{_localstatedir}/lib/%{name}
 %attr(0750,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}
 
 %changelog
+* Thu Feb 25 2014 Daniel Hoffend <dh@dotlan.net> - 0.2-4
+- applied fix for recent libkolab changes
+
+* Thu Jan 23 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.2-3
+- Correct any suhosin.session.encrypt setting using .htaccess
+- Correct source of chwala.conf
+
+* Tue Nov 26 2013 Daniel Hoffend <dh@dotlan.net> - 0.2-1.1
+- added logrotate script
+
 * Sun Nov 24 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.2-1
 - New upstream version