diff options
author | Simo Sorce <ssorce@redhat.com> | 2008-08-08 09:35:05 -0400 |
---|---|---|
committer | Simo Sorce <ssorce@redhat.com> | 2008-08-11 18:31:05 -0400 |
commit | 9648da8f5f5e4292451f1ba796c4fd027585fdce (patch) | |
tree | abcc4b616dd33a9b770dd1266a1c2d700f671e70 /ipa-server | |
parent | 0368d4329ae54d97b6fb5da60580beefa29d07bc (diff) | |
download | freeipa-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-server')
-rw-r--r-- | ipa-server/Makefile.am | 1 | ||||
-rw-r--r-- | ipa-server/configure.ac | 3 | ||||
-rw-r--r-- | ipa-server/ipa-server.spec.in | 4 | ||||
-rw-r--r-- | ipa-server/selinux/Makefile | 6 | ||||
-rw-r--r-- | ipa-server/selinux/ipa-server-selinux.spec.in | 4 | ||||
-rw-r--r-- | ipa-server/version.m4.in | 1 |
6 files changed, 11 insertions, 8 deletions
diff --git a/ipa-server/Makefile.am b/ipa-server/Makefile.am index a0e8bdad9..6fb854d3e 100644 --- a/ipa-server/Makefile.am +++ b/ipa-server/Makefile.am @@ -62,6 +62,7 @@ MAINTAINERCLEANFILES = \ Makefile.in \ config.h.* \ aclocal.m4 \ + version.m4 \ ipa-server.spec \ py-compile \ $(NULL) diff --git a/ipa-server/configure.ac b/ipa-server/configure.ac index 341c07094..7260559c8 100644 --- a/ipa-server/configure.ac +++ b/ipa-server/configure.ac @@ -1,6 +1,7 @@ AC_PREREQ(2.59) +m4_include(version.m4) AC_INIT([ipa-server], - [0.6.0], + IPA_VERSION, [https://hosted.fedoraproject.org/projects/freeipa/newticket]) AC_CONFIG_SRCDIR([ipaserver/ipaldap.py]) diff --git a/ipa-server/ipa-server.spec.in b/ipa-server/ipa-server.spec.in index e5bb5b9db..4a7840529 100644 --- a/ipa-server/ipa-server.spec.in +++ b/ipa-server/ipa-server.spec.in @@ -1,6 +1,6 @@ Name: ipa-server -Version: VERSION -Release: 3%{?dist} +Version: __VERSION__ +Release: __RELEASE__%{?dist} Summary: IPA authentication server Group: System Environment/Base diff --git a/ipa-server/selinux/Makefile b/ipa-server/selinux/Makefile index 3d42a4c7f..a662d2fd4 100644 --- a/ipa-server/selinux/Makefile +++ b/ipa-server/selinux/Makefile @@ -13,11 +13,11 @@ clean: @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) -f $(POLICY_MAKEFILE) $@) || exit 1; \ done - rm -f ipa-server-selinux.spec - -maintainer-clean: clean distclean: clean + rm -f ipa-server-selinux.spec + +maintainer-clean: distclean install: all install -d $(POLICY_DIR) diff --git a/ipa-server/selinux/ipa-server-selinux.spec.in b/ipa-server/selinux/ipa-server-selinux.spec.in index 9fe450a34..3387553ab 100644 --- a/ipa-server/selinux/ipa-server-selinux.spec.in +++ b/ipa-server/selinux/ipa-server-selinux.spec.in @@ -1,8 +1,8 @@ %define POLICYCOREUTILSVER 1.33.12-1 Name: ipa-server-selinux -Version: VERSION -Release: 1%{?dist} +Version: __VERSION__ +Release: __RELEASE__%{?dist} Summary: IPA server SELinux policies Group: System Environment/Base diff --git a/ipa-server/version.m4.in b/ipa-server/version.m4.in new file mode 100644 index 000000000..5ddc8cea3 --- /dev/null +++ b/ipa-server/version.m4.in @@ -0,0 +1 @@ +define([IPA_VERSION], [__VERSION__]) |