diff options
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 a0e8bdad..6fb854d3 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 341c0709..7260559c 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 e5bb5b9d..4a784052 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 3d42a4c7..a662d2fd 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 9fe450a3..3387553a 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 00000000..5ddc8cea --- /dev/null +++ b/ipa-server/version.m4.in @@ -0,0 +1 @@ +define([IPA_VERSION], [__VERSION__]) |