From 9648da8f5f5e4292451f1ba796c4fd027585fdce Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce@redhat.com>
Date: Fri, 8 Aug 2008 09:35:05 -0400
Subject: Fix versioning for configure.ac and ipa-python/setup.py

Fix make maintainer-clean

Also make RPM naming consistent by using a temp RELEASE file.
This one helps when testing builds using rpms.
Just 'echo X > RELEASE' to build a new rpms (X, X+1, X+2 ...)

Version 1.1.0 was released some times ago, bump up to 1.1.1
---
 ipa-python/Makefile           | 3 ++-
 ipa-python/ipa-python.spec.in | 4 ++--
 ipa-python/setup.py.in        | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'ipa-python')

diff --git a/ipa-python/Makefile b/ipa-python/Makefile
index 13160457..4ac027e1 100644
--- a/ipa-python/Makefile
+++ b/ipa-python/Makefile
@@ -13,9 +13,10 @@ install:
 	fi
 
 clean:
-	rm -f *~ *.pyc setup.py ipa-python.spec version.py
+	rm -f *~ *.pyc
 
 distclean: clean
+	rm -f setup.py ipa-python.spec version.py
 
 maintainer-clean: distclean
 	rm -rf build
diff --git a/ipa-python/ipa-python.spec.in b/ipa-python/ipa-python.spec.in
index 77446495..a41a413e 100755
--- a/ipa-python/ipa-python.spec.in
+++ b/ipa-python/ipa-python.spec.in
@@ -1,6 +1,6 @@
 Name:           ipa-python
-Version:        VERSION
-Release:        1%{?dist}
+Version:        __VERSION__
+Release:        __RELEASE__%{?dist}
 Summary:        IPA authentication server
 
 Group:          System Environment/Base
diff --git a/ipa-python/setup.py.in b/ipa-python/setup.py.in
index a48b8e69..19940f38 100644
--- a/ipa-python/setup.py.in
+++ b/ipa-python/setup.py.in
@@ -52,7 +52,7 @@ def setup_package():
     try:
         setup(
             name = "ipa",
-            version = "0.6.0",
+            version = "__VERSION__",
             license = "GPL",
             author = "Karl MacMillan, et.al.",
             author_email = "kmacmill@redhat.com",
-- 
cgit