summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Wickert <wickert@kolabsys.com>2011-04-26 10:08:13 (GMT)
committerChristoph Wickert <wickert@kolabsys.com>2011-04-26 10:08:13 (GMT)
commit9a4ac3fab7348aa0d87c1ac9abb0f6c366dea17f (patch)
tree26b56e5b9f7c91489929f17c7f0100ac271569b8
parent0a7cdb7a9142f2f5fe9bcf29a8a1f9d164c635f5 (diff)
downloadserver-9a4ac3fab7348aa0d87c1ac9abb0f6c366dea17f.tar.gz
Update to 1.5.2 and fix bugzilla.kolabsys.com #73
-rw-r--r--z-push/z-push.conf4
-rw-r--r--z-push/z-push.spec10
2 files changed, 9 insertions, 5 deletions
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@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@fedoraproject.org> - 1.5.1-1
- Update to 1.5.1