Support proper 'foreign'/patched packages versioning.

diff --git a/configure.in b/configure.in
index bf9b2eb..b01df41 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,11 @@ AC_PREREQ(2.50)
 AC_INIT(AUTHORS)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(lufs,0.9.6)
+VERSION_BASE=0.9.6
+VERSION_EXT=captive1
+AC_SUBST(VERSION_BASE)
+AC_SUBST(VERSION_EXT)
+AM_INIT_AUTOMAKE(lufs,$VERSION_BASE$VERSION_EXT)
 AM_MAINTAINER_MODE
 dnl Some Makefiles use additional tests etc.
 AM_CONDITIONAL(MAINTAINER_MODE,[test "$USE_MAINTAINER_MODE" = "yes"])

diff --git a/lufs.spec.in b/lufs.spec.in
index e2cc91b..422e74e 100644 (file)
--- a/lufs.spec.in
+++ b/lufs.spec.in
@@ -1,11 +1,11 @@
 Summary:       lufs - Linux Userland File System
 Name:          @PACKAGE@
-Version:       @VERSION@
-Release:       1captivecvs
+Version:       @VERSION_BASE@
+Release:       1@VERSION_EXT@
 License:       GPL
 Group:         Base
-Source0:       @PACKAGE@-@VERSION@.tar.gz
-Patch1:                @PACKAGE@-@VERSION@-captive.patch
+Source0:       @PACKAGE@-@VERSION_BASE@.tar.gz
+Patch1:                @PACKAGE@-@VERSION_BASE@-@VERSION_EXT@.patch
 BuildRequires: autoconf
 BuildRequires: automake >= 1.6
 BuildRequires: libtool