From fbd313c5dd3b4c56cf3a3c4d7a876c6d550526df Mon Sep 17 00:00:00 2001
From: paulc <paulc@acf43c95-373e-0410-b603-e72c3f656dc1>
Date: Thu, 18 Sep 2008 15:33:08 +0000
Subject: [PATCH] Added way to put SVN revision in package.

git-svn-id: http://yate.null.ro/svn/yate/trunk@2214 acf43c95-373e-0410-b603-e72c3f656dc1
---
 Makefile.in              | 8 ++++++--
 configure.in             | 2 ++
 packing/rpm/yate.spec.in | 7 ++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index d917a09d..9bdc0179 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -254,8 +254,8 @@ uninstall uninstall-root:
 
 install-root uninstall-root: LDCONFIG:=ldconfig
 
-.PHONY: snapshot tarball rpm srpm
-snapshot tarball: check-topdir clean tables windows apidocs
+.PHONY: snapshot tarball rpm srpm revision
+snapshot tarball: check-topdir revision clean tables windows apidocs
 	@if [ $@ = snapshot ]; then ver="`date '+SVN-%Y%m%d'`"; else ver="@PACKAGE_VERSION@-@PACKAGE_STATUS@@PACKAGE_RELEASE@"; fi ; \
 	wd=`pwd|sed 's,^.*/,,'`; \
 	mkdir -p packing/tarballs; cd ..; \
@@ -292,6 +292,10 @@ rpm: check-root tarball
 srpm: check-root tarball
 	rpmbuild -ta packing/tarballs/@PACKAGE_TARNAME@-@PACKAGE_VERSION@-@PACKAGE_STATUS@@PACKAGE_RELEASE@.tar.gz
 
+revision: check-topdir
+	@-rev=`svn info 2>/dev/null | sed -n 's,^Revision: *,,p'`; \
+	test -z "$$rev" || echo "$$rev" > packing/revision.txt
+
 %.o: @srcdir@/%.cpp $(MKDEPS) @srcdir@/yatengine.h
 	$(COMPILE) -c $<
 
diff --git a/configure.in b/configure.in
index 65c52bd2..d757a7f5 100644
--- a/configure.in
+++ b/configure.in
@@ -5,6 +5,7 @@ AC_PREREQ(2.52)
 
 PACKAGE_RELEASE="1"
 PACKAGE_STATUS=""
+PACKAGE_REVISION=`cat packing/revision.txt 2>/dev/null`
 
 PACKAGE_VERSION_MAJOR="${PACKAGE_VERSION%%.*}"
 PACKAGE_VERSION_MINOR="${PACKAGE_VERSION#*.}"
@@ -17,6 +18,7 @@ AC_SUBST(PACKAGE_VERSION_BUILD)
 AC_SUBST(PACKAGE_VERSION_RELEASE)
 AC_SUBST(PACKAGE_RELEASE)
 AC_SUBST(PACKAGE_STATUS)
+AC_SUBST(PACKAGE_REVISION)
 
 # sed expression to convert version into something comparable lexicographically
 vsed='s/\(^\|\.\)\([[0-9]]\)\($\|\.\)/\10\2\3/g'
diff --git a/packing/rpm/yate.spec.in b/packing/rpm/yate.spec.in
index bb9bc74f..21e08986 100644
--- a/packing/rpm/yate.spec.in
+++ b/packing/rpm/yate.spec.in
@@ -1,4 +1,5 @@
 # to add a distro release tag run rpmbuild --define 'dist value'
+# to add a revision tag run rpmbuild --define 'revision value'
 # to suppress auto dependencies run rpmbuild --define 'nodeps 1'
 # to disable PSTN card drivers run rpmbuild --define 'nopstn 1'
 # to disable H.323 support run rpmbuild --define 'noh323 1'
@@ -10,6 +11,10 @@
 %{?noh323:%define no_h323 1}
 %{?nogui:%define no_gui 1}
 
+%if "%{revision}" == "svn"
+%define revision svn@PACKAGE_REVISION@-
+%endif
+
 %if "%{dist}" == ""
 %define dist %(test -f /etc/mandriva-release && echo mdv)
 %endif
@@ -35,7 +40,7 @@
 Summary:	Yet Another Telephony Engine
 Name:     	@PACKAGE_TARNAME@
 Version: 	@PACKAGE_VERSION@
-Release:	@PACKAGE_STATUS@@PACKAGE_RELEASE@%{dist}
+Release:	%{revision}@PACKAGE_STATUS@@PACKAGE_RELEASE@%{dist}
 License:	GPL
 Packager:	Paul Chitescu <paulc@voip.null.ro>
 Source:		http://yate.null.ro/%{name}-%{version}-@PACKAGE_STATUS@@PACKAGE_RELEASE@.tar.gz