Branch '2.3-stable' - z-push/z-push.conf z-push/z-push.spec

Christoph Wickert wickert at kolabsys.com
Mon May 2 12:18:47 CEST 2011


 z-push/z-push.conf |   30 --------------------------
 z-push/z-push.spec |   59 +++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 46 insertions(+), 43 deletions(-)

New commits:
commit 0cc67fe4dd4577de7ad894393210a0f3dbd2a7c3
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Mon May 2 12:18:24 2011 +0200

    z-push: Create z-push.conf for apache on the fly rather than shipping it

diff --git a/z-push/z-push.conf b/z-push/z-push.conf
deleted file mode 100644
index ed8a599..0000000
--- a/z-push/z-push.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Z-Push - ActiveSync over-the-air implementation
-#
-
-Alias /Microsoft-Server-ActiveSync @l_prefix@/var/kolab/www/z-push/index.php
-
-# If the PHP settings are not set up correctly, login will fail
-#
-<Directory @l_prefix@/var/kolab/www/z-push>
-    # Some apache settings
-    Options -Indexes +FollowSymLinks
-
-    # Register globals must be off
-    php_value register_globals off
-
-    # Magic quotes must be off
-    php_value magic_quotes_gpc off
-    php_value magic_quotes_runtime off
-
-    # Short open tags must be on
-    php_value short_open_tag on
-
-    # Allow passing variable by reference
-    php_value allow_call_time_pass_reference on
-    
-    <Files "debug.txt">
-        Deny from All
-    </Files>
-    
-</Directory>
diff --git a/z-push/z-push.spec b/z-push/z-push.spec
index 25cd34a..bbc0510 100644
--- a/z-push/z-push.spec
+++ b/z-push/z-push.spec
@@ -4,7 +4,7 @@
 # Package Information
 Name:           z-push
 Version:        1.5.2
-Release:        1
+Release:        2
 Summary:        Implementation of the ActiveSync protocol
 # "Web" seems the most reasonable choice from
 # /kolab/bin/openpkg rpm -qa --qf %{group}\\n | sort | uniq
@@ -18,7 +18,6 @@ Distribution:	OpenPKG
 # List of Sources
 Source0:        http://download.berlios.de/z-push/%{name}-%{version}.tar.gz
 Source1:        https://kolabzpush.svn.sourceforge.net/svnroot/kolabzpush/tags/0.6.1/include/z_RTF.php
-Source2:        z-push.conf
 
 # Build Info
 Prefix:		    %{l_prefix}
@@ -46,8 +45,39 @@ groupware can be connected and synced with these devices.
 %setup -qn %{name}
 
 %build
-# make sure prefix is correct
-sed -i 's|@l_prefix@|%{l_prefix}|g' %{SOURCE2}
+cat > z-push.conf <<EOF
+#
+# Z-Push - ActiveSync over-the-air implementation
+#
+
+Alias /Microsoft-Server-ActiveSync %{l_prefix}/var/kolab/www/z-push/index.php
+
+# If the PHP settings are not set up correctly, login will fail
+#
+<Directory %{l_prefix}/var/kolab/www/z-push>
+    # Some apache settings
+    Options -Indexes +FollowSymLinks
+
+    # Register globals must be off
+    php_value register_globals off
+
+    # Magic quotes must be off
+    php_value magic_quotes_gpc off
+    php_value magic_quotes_runtime off
+
+    # Short open tags must be on
+    php_value short_open_tag on
+
+    # Allow passing variable by reference
+    php_value allow_call_time_pass_reference on
+
+    <Files "debug.txt">
+        Deny from All
+    </Files>
+
+</Directory>
+EOF
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,7 +90,7 @@ install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/z-push/inclu
 rm $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/z-push/config.php 
 # Install apache.d drop-in config
 mkdir -p $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d
-install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d/
+install -pm 644 z-push.conf $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d/
 
 #%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
@@ -89,29 +119,32 @@ chown kolab-n:kolab-n %{l_prefix}/var/kolab/www/z-push/state/ ||:
 
 
 %changelog
-* Thu Apr 21 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.5.2-1
+* Mon May 02 2011 Christoph Wickert <wickert at kolabsys.com> - 1.5.2-2
+- Create z-push.conf for apache on the fly rather than shipping it
+
+* Thu Apr 21 2011 Christoph Wickert <wickert at kolabsys.com> - 1.5.2-1
 - Update to 1.5.2
 - Fix Alias in z-push.conf (bugzilla.kolabsys.com #73)
 
-* Tue Feb 22 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.5.1-1
+* Tue Feb 22 2011 Christoph Wickert <wickert at kolabsys.com> - 1.5.1-1
 - Update to 1.5.1
 
-* Fri Jan 21 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.5-1
+* Fri Jan 21 2011 Christoph Wickert <wickert at kolabsys.com> - 1.5-1
 - Update to 1.5 final
 
-* Mon Dec 06 2010 Christoph Wickert <cwickert at fedoraproject.org> -  1.5-0.2.beta2
+* Mon Dec 06 2010 Christoph Wickert <wickert at kolabsys.com> -  1.5-0.2.beta2
 - Bump release for Kolab 2.3 alpha
 
-* Fri Nov 26 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.5-0.1.beta2
+* Fri Nov 26 2010 Christoph Wickert <wickert at kolabsys.com> - 1.5-0.1.beta2
 - Update to 1.5.beta2
 
-* Sun Sep 12 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.5-0.1.beta1
+* Sun Sep 12 2010 Christoph Wickert <wickert at kolabsys.com> - 1.5-0.1.beta1
 - Update to 1.5.beta1
 
-* Wed Aug 25 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.4.1
+* Wed Aug 25 2010 Christoph Wickert <wickert at kolabsys.com> - 1.4.1
 - Update to 1.4.1
 
-* Wed Jul 14 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.4.1-01.RC-1
+* Wed Jul 14 2010 Christoph Wickert <wickert at kolabsys.com> - 1.4.1-01.RC-1
 - Update to 1.4.1RC
 
 * Fri Jul 09 2010 Christoph Wickert <wickert at kolabsys.com> - 1.3-3





More information about the commits mailing list