z-push/z-push.conf z-push/z-push.spec

Christoph Wickert wickert at kolabsys.com
Tue Apr 26 12:08:17 CEST 2011


 z-push/z-push.conf |    4 ++--
 z-push/z-push.spec |   10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 9a4ac3fab7348aa0d87c1ac9abb0f6c366dea17f
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Tue Apr 26 12:08:13 2011 +0200

    Update to 1.5.2 and fix bugzilla.kolabsys.com #73

diff --git a/z-push/z-push.conf b/z-push/z-push.conf
index 1e719ee..ed8a599 100644
--- a/z-push/z-push.conf
+++ b/z-push/z-push.conf
@@ -2,11 +2,11 @@
 # Z-Push - ActiveSync over-the-air implementation
 #
 
-Alias /Microsoft-Server-ActiveSync @webserver_document_root@/z-push/index.php
+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 @webserver_document_root@/z-push>
+<Directory @l_prefix@/var/kolab/www/z-push>
     # Some apache settings
     Options -Indexes +FollowSymLinks
 
diff --git a/z-push/z-push.spec b/z-push/z-push.spec
index 448775d..374a849 100644
--- a/z-push/z-push.spec
+++ b/z-push/z-push.spec
@@ -3,7 +3,7 @@
 
 # Package Information
 Name:           z-push
-Version:        1.5.1
+Version:        1.5.2
 Release:        1
 Summary:        Implementation of the ActiveSync protocol
 # "Web" seems the most reasonable choice from
@@ -46,8 +46,8 @@ groupware can be connected and synced with these devices.
 %setup -qn %{name}
 
 %build
-# nothing to build
-
+# make sure prefix is correct
+#sed -i 's|@l_prefix@|%{l_prefix}|g' z-push.conf %{SOURCE2}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -89,6 +89,10 @@ 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
+- 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
 - Update to 1.5.1
 





More information about the commits mailing list