rpms/kernel-xen-2.6/devel kernel-xen.spec,1.42,1.43

[Eduardo Habkost (ehabkost)]

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15259

Modified Files:
	kernel-xen.spec 
Log Message:
Trick to make the RPM revision number increase automatically again



Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kernel-xen.spec	9 Aug 2007 17:23:50 -0000	1.42
+++ kernel-xen.spec	9 Aug 2007 18:12:25 -0000	1.43
@@ -32,7 +32,23 @@
 %define sublevel 21
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+
+# The trick below will allow us to use the automatic CVS Revision keyword
+# expansion again, without breaking release number ordering.
+#
+# CVS Revision 1.42 was after RPM Release 2925.14. We do some math to
+# increase the Release number starting from 2926
+%define baserevision 42
+%define baserelease 2926
+%define release %(R="$Revision$"; \
+	# be careful: '%%' becomes '%' below \
+	R="${R%% \$}"; R="${R##: 1.}"; \
+	# keep anything after the first dot, so this won't \
+	# break horribily when using branches \
+	# (e.g. 1.42.1.2.3.4 will become 1.2926.1.2.3.4) \
+	r1="${R%%%%.*}";rest="${R#$r1}"; \
+	# now, the math: \
+	echo `expr '(' $r1 - %{baserevision} ')' + %{baserelease}`$rest)
 
 %define make_target bzImage
 %define kernel_image x86