rpms/z-push/devel z-push.conf,1.2,1.3 z-push.spec,1.13,1.14

[Robert Scheck]

Author: robert

Update of /cvs/free/rpms/z-push/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8442/devel

Modified Files:
	z-push.conf z-push.spec 
Log Message:
Added configuration compatibility for Apache 2.2 and 2.4



Index: z-push.conf
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/z-push.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- z-push.conf	8 Nov 2012 21:38:17 -0000	1.2
+++ z-push.conf	5 Aug 2013 00:51:50 -0000	1.3
@@ -10,6 +10,15 @@
     # Some apache settings
     Options -Indexes +FollowSymLinks
 
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        Order allow,deny
+        Allow from all
+    </IfModule>
+
     # Register globals must be off
     php_flag register_globals off
 


Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/z-push.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- z-push.spec	28 Apr 2013 21:12:49 -0000	1.13
+++ z-push.spec	5 Aug 2013 00:51:50 -0000	1.14
@@ -3,7 +3,7 @@
 Summary:        ActiveSync over-the-air implementation for mobile syncing
 Name:           z-push
 Version:        2.0.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        AGPLv3 with exceptions
 Group:          Applications/Productivity
 URL:            http://z-push.sourceforge.net/
@@ -200,6 +200,9 @@
 %{_datadir}/%{name}/backend/zarafa/
 
 %changelog
+* Mon Aug 05 2013 Robert Scheck <robert at fedoraproject.org> 2.0.7-3
+- Added configuration compatibility for Apache 2.2 and 2.4
+
 * Sun Apr 28 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.7-2
 - https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild