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

[Christoph Wickert]

 z-push/Makefile    |    3 ++-
 z-push/z-push.spec |   13 +++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 294b601b880820194332d17235d7603d893cb85d
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Jun 3 01:09:36 2011 +0200

    z-push: Use macros for the svn revision number. This will do but it still sucks

diff --git a/z-push/Makefile b/z-push/Makefile
index f71a4d4..98f09dc 100644
--- a/z-push/Makefile
+++ b/z-push/Makefile
@@ -2,10 +2,11 @@ include ../make-helper/kolab.mk
 
 PACKAGE = $(shell grep "^Name:" *.spec | sed -e "s/^Name:\s*\([a-z-]*\).*/\1/")
 VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
+SVNREV= $(shell grep "%define.*svnrev" *.spec | sed -e "s/%define.*svnrev\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9._a-z]*\).*/\1/")
 
 SOURCE_URL=http://download.berlios.de/z-push/
-SOURCE_0=$(PACKAGE)-$(VERSION)-685.tar.gz
+SOURCE_0=$(PACKAGE)-$(VERSION)-$(SVNREV).tar.gz
 EXTRA=z_RTF.php
 
 include ../make-helper/package.mk
diff --git a/z-push/z-push.spec b/z-push/z-push.spec
index 189f52d..d7122e8 100644
--- a/z-push/z-push.spec
+++ b/z-push/z-push.spec
@@ -1,5 +1,6 @@
 # Variables
 %define         prerelease beta2
+%define         svnrev 685
 
 # Package Information
 Name:           z-push
@@ -11,17 +12,17 @@ Summary:        Implementation of the ActiveSync protocol
 Group:          Web
 License:        GPLv2
 URL:            http://z-push.sourceforge.net/
-Packager:	    Christoph Wickert <wickert at kolabsys.com>
+Packager:       Christoph Wickert <wickert at kolabsys.com>
 Vendor:         Kolab Systems AG <contact at kolabsys.com>
-Distribution:	OpenPKG
+Distribution:   OpenPKG
 
 # List of Sources
-Source0:        http://download.berlios.de/z-push/%{name}-%{version}-685.tar.gz
+Source0:        http://download.berlios.de/z-push/%{name}-%{version}-%{svnrev}.tar.gz
 Source1:        https://kolabzpush.svn.sourceforge.net/svnroot/kolabzpush/tags/0.6.1/include/z_RTF.php
 
 # Build Info
-Prefix:		    %{l_prefix}
-BuildRoot:	    %{l_buildroot}
+Prefix:         %{l_prefix}
+BuildRoot:      %{l_buildroot}
 # buildsys doesn't do noarch 
 #BuildArch:      noarch
 
@@ -42,7 +43,7 @@ groupware can be connected and synced with these devices.
 
 
 %prep
-%setup -qn %{name}
+%setup -qn %{name}-%{version}-%{svnrev}
 
 %build
 cat > z-push.conf <<EOF