packages: nforenum/nforenum.spec - better version, it is 3.4.6

[sparky]

Author: sparky                       Date: Sat May  1 17:53:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- better version, it is 3.4.6

---- Files affected:
packages/nforenum:
   nforenum.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/nforenum/nforenum.spec
diff -u packages/nforenum/nforenum.spec:1.2 packages/nforenum/nforenum.spec:1.3
--- packages/nforenum/nforenum.spec:1.2	Sat May  1 19:46:45 2010
+++ packages/nforenum/nforenum.spec	Sat May  1 19:53:09 2010
@@ -1,12 +1,13 @@
 # $Revision$, $Date$
+%define		rev	2309
 Summary:	Tool to create add-ons for TTDPatch and OpenTTD
 Summary(pl.UTF-8):	Narzędzie do tworzenia dodatków dla TTDPatch oraz OpenTTD
 Name:		nforenum
-Version:	r2309
-Release:	1
+Version:	3.4.6
+Release:	0.%{rev}.1
 License:	GPL v2+
 Group:		Applications
-Source0:	http://binaries.openttd.org/extra/nforenum/%{version}/%{name}-%{version}-source.tar.bz2
+Source0:	http://binaries.openttd.org/extra/nforenum/%{version}/%{name}-r%{rev}-source.tar.bz2
 # Source0-md5:	cab21665a9a14339c590a8f9981787c3
 Patch0:		%{name}-cflags.patch
 URL:		http://www.openttd.org/en/download-nforenum
@@ -25,12 +26,18 @@
 oraz OpenTTD.
 
 %prep
-%setup -q
+%setup -q -n %{name}-r%{rev}
 %patch0 -p1
 
+VER=$(awk '/VER /{print $3}' version.def)
+if [ "$VER" != "%{version}" ]; then
+	: Current version is $VER, not %{version}
+	exit 1
+fi
+
 %build
 %{__make} \
-	SVNVERSION="echo %{version} | tr -d r" \
+	SVNVERSION="echo %{rev}" \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
 	CFLAGAPP="%{rpmcxxflags}" \
@@ -57,6 +64,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/05/01 17:53:09  sparky
+- better version, it is 3.4.6
+
 Revision 1.2  2010/05/01 17:46:45  sparky
 - correct svn revision
 - BR: boost-devel, libstdc++-devel, perl-base
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nforenum/nforenum.spec?r1=1.2&r2=1.3&f=u