second attempt to have util-vserver ready for module-tools

diff --git a/util-vserver.spec b/util-vserver.spec
index 241f3f2..2f75f3a 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -13,17 +13,20 @@
 
 %global _localstatedir %_var
 
-%global ver            %( echo 0.30.215 | sed 's/-.*//' )
-%global subver         %( s=`echo 0.30.215 | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} )
-%global fullver                0.30.215
+%global fullver 0.30.215
+%global ver            %( echo %fullver | sed 's/-.*//' )
+%global subver         %( s=`echo %fullver | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} )
 
+# for module-tools
+%global module_version_varname fullver
+%global taglevel 2
 
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Summary:       Linux virtual server utilities
 Name:          util-vserver
 Version:       %ver
-Release:       %release_func 1%subver
+Release:       %taglevel
 License:       GPL
 Group:         System Environment/Base
 URL:           http://savannah.nongnu.org/projects/util-vserver/

diff --git a/util-vserver.spec.in b/util-vserver.spec.in
index fd80bde..19e0da8 100644 (file)
--- a/util-vserver.spec.in
+++ b/util-vserver.spec.in
@@ -13,17 +13,20 @@
 
 %global _localstatedir %_var
 
-%global ver            %( echo @VERSION@ | sed 's/-.*//' )
-%global subver         %( s=`echo @VERSION@ | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} )
-%global fullver                @VERSION@
+%global fullver @VERSION@
+%global ver            %( echo %fullver | sed 's/-.*//' )
+%global subver         %( s=`echo %fullver | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} )
 
+# for module-tools
+%global module_version_varname fullver
+%global taglevel 2
 
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Summary:       Linux virtual server utilities
 Name:          @PACKAGE@
 Version:       %ver
-Release:       %release_func 1%subver
+Release:       %taglevel
 License:       GPL
 Group:         System Environment/Base
 URL:           http://savannah.nongnu.org/projects/util-vserver/