summaryrefslogtreecommitdiffstats
path: root/ipa-client
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2008-08-08 09:35:05 -0400
committerSimo Sorce <ssorce@redhat.com>2008-08-11 18:31:05 -0400
commit9648da8f5f5e4292451f1ba796c4fd027585fdce (patch)
treeabcc4b616dd33a9b770dd1266a1c2d700f671e70 /ipa-client
parent0368d4329ae54d97b6fb5da60580beefa29d07bc (diff)
downloadfreeipa-9648da8f5f5e4292451f1ba796c4fd027585fdce.tar.gz
freeipa-9648da8f5f5e4292451f1ba796c4fd027585fdce.tar.xz
freeipa-9648da8f5f5e4292451f1ba796c4fd027585fdce.zip
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
Diffstat (limited to 'ipa-client')
-rw-r--r--ipa-client/Makefile.am1
-rw-r--r--ipa-client/configure.ac3
-rw-r--r--ipa-client/ipa-client.spec.in4
-rw-r--r--ipa-client/version.m4.in1
4 files changed, 6 insertions, 3 deletions
diff --git a/ipa-client/Makefile.am b/ipa-client/Makefile.am
index b93e6f35b..796a923fa 100644
--- a/ipa-client/Makefile.am
+++ b/ipa-client/Makefile.am
@@ -74,6 +74,7 @@ MAINTAINERCLEANFILES = \
Makefile.in \
config.h.* \
aclocal.m4 \
+ version.m4 \
ipa-client.spec \
py-compile \
$(NULL)
diff --git a/ipa-client/configure.ac b/ipa-client/configure.ac
index c9dbdfae3..b639e1d14 100644
--- a/ipa-client/configure.ac
+++ b/ipa-client/configure.ac
@@ -1,6 +1,7 @@
AC_PREREQ(2.59)
+m4_include(version.m4)
AC_INIT([ipa-client],
- [0.6.0],
+ IPA_VERSION,
[https://hosted.fedoraproject.org/projects/freeipa/newticket])
AC_CONFIG_SRCDIR([ipaclient/__init__.py])
diff --git a/ipa-client/ipa-client.spec.in b/ipa-client/ipa-client.spec.in
index f228b863f..686259ad2 100644
--- a/ipa-client/ipa-client.spec.in
+++ b/ipa-client/ipa-client.spec.in
@@ -1,6 +1,6 @@
Name: ipa-client
-Version: VERSION
-Release: 1%{?dist}
+Version: __VERSION__
+Release: __RELEASE__%{?dist}
Summary: IPA client
Group: System Environment/Base
diff --git a/ipa-client/version.m4.in b/ipa-client/version.m4.in
new file mode 100644
index 000000000..5ddc8cea3
--- /dev/null
+++ b/ipa-client/version.m4.in
@@ -0,0 +1 @@
+define([IPA_VERSION], [__VERSION__])