IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-23 15:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix versioning for configure.ac and ipa-python/setup.py

Browse Source 
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
This commit is contained in:
Simo Sorce 2008-08-08 09:35:05 -04:00
parent 0368d4329a
commit 9648da8f5f
21 changed files with 78 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
Makefile
View File

@ -50,19 +50,21 @@ RADIUS_ADMINTOOLS_TARBALL=$(RADIUS_ADMINTOOLS_TARBALL_PREFIX).tgz
SERV_SELINUX_TARBALL_PREFIX=$(PRJ_PREFIX)-server-selinux-$(IPA_VERSION) SERV_SELINUX_TARBALL_PREFIX=$(PRJ_PREFIX)-server-selinux-$(IPA_VERSION)
SERV_SELINUX_TARBALL=$(SERV_SELINUX_TARBALL_PREFIX).tgz SERV_SELINUX_TARBALL=$(SERV_SELINUX_TARBALL_PREFIX).tgz
IPA_RPM_RELEASE=$(shell cat RELEASE)
LIBDIR ?= /usr/lib LIBDIR ?= /usr/lib
all: version-update bootstrap-autogen all: bootstrap-autogen
@for subdir in $(SUBDIRS); do \ @for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \ (cd $$subdir && $(MAKE) $@) || exit 1; \
done done
bootstrap-autogen: bootstrap-autogen: version-update
@echo "Building IPA $(IPA_VERSION)" @echo "Building IPA $(IPA_VERSION)"
cd ipa-server; if [ ! -e Makefile ]; then ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi cd ipa-server; if [ ! -e Makefile ]; then ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
cd ipa-client; if [ ! -e Makefile ]; then ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi cd ipa-client; if [ ! -e Makefile ]; then ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
autogen: autogen: version-update
@echo "Building IPA $(IPA_VERSION)" @echo "Building IPA $(IPA_VERSION)"
cd ipa-server; ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR) cd ipa-server; ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR)
cd ipa-client; ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR) cd ipa-client; ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR)
@ -81,30 +83,41 @@ test:
(cd $$subdir && $(MAKE) $@) || exit 1; \ (cd $$subdir && $(MAKE) $@) || exit 1; \
done done
version-update: release-update:
sed s/VERSION/$(IPA_VERSION)/ ipa-server/ipa-server.spec.in \ if [ ! -e RELEASE ]; then echo 0 > RELEASE; fi
> ipa-server/ipa-server.spec
sed s/VERSION/$(IPA_VERSION)/ ipa-admintools/ipa-admintools.spec.in \ version-update: release-update
> ipa-admintools/ipa-admintools.spec sed -e s/__VERSION__/$(IPA_VERSION)/ -e s/__RELEASE__/$(IPA_RPM_RELEASE)/ \
ipa-server/ipa-server.spec.in > ipa-server/ipa-server.spec
sed -e s/__VERSION__/$(IPA_VERSION)/ ipa-server/version.m4.in \
> ipa-server/version.m4
sed s/VERSION/$(IPA_VERSION)/ ipa-python/ipa-python.spec.in \ sed -e s/__VERSION__/$(IPA_VERSION)/ -e s/__RELEASE__/$(IPA_RPM_RELEASE)/ \
> ipa-python/ipa-python.spec ipa-admintools/ipa-admintools.spec.in > ipa-admintools/ipa-admintools.spec
sed s/VERSION/$(IPA_VERSION)/ ipa-client/ipa-client.spec.in \ sed -e s/__VERSION__/$(IPA_VERSION)/ -e s/__RELEASE__/$(IPA_RPM_RELEASE)/ \
> ipa-client/ipa-client.spec ipa-python/ipa-python.spec.in > ipa-python/ipa-python.spec
sed s/VERSION/$(IPA_VERSION)/ ipa-radius-server/ipa-radius-server.spec.in \ sed -e s/__VERSION__/$(IPA_VERSION)/ -e s/__RELEASE__/$(IPA_RPM_RELEASE)/ \
ipa-client/ipa-client.spec.in > ipa-client/ipa-client.spec
sed -e s/__VERSION__/$(IPA_VERSION)/ ipa-client/version.m4.in \
> ipa-client/version.m4
sed -e s/__VERSION__/$(IPA_VERSION)/ -e s/__RELEASE__/$(IPA_RPM_RELEASE)/ \
ipa-radius-server/ipa-radius-server.spec.in \
> ipa-radius-server/ipa-radius-server.spec > ipa-radius-server/ipa-radius-server.spec
sed s/VERSION/$(IPA_VERSION)/ ipa-radius-admintools/ipa-radius-admintools.spec.in \ sed -e s/__VERSION__/$(IPA_VERSION)/ -e s/__RELEASE__/$(IPA_RPM_RELEASE)/ \
ipa-radius-admintools/ipa-radius-admintools.spec.in \
> ipa-radius-admintools/ipa-radius-admintools.spec > ipa-radius-admintools/ipa-radius-admintools.spec
sed s/VERSION/$(IPA_VERSION)/ ipa-server/selinux/ipa-server-selinux.spec.in \ sed -e s/__VERSION__/$(IPA_VERSION)/ -e s/__RELEASE__/$(IPA_RPM_RELEASE)/ \
ipa-server/selinux/ipa-server-selinux.spec.in \
> ipa-server/selinux/ipa-server-selinux.spec > ipa-server/selinux/ipa-server-selinux.spec
sed s/VERSION/$(IPA_VERSION)/ ipa-python/setup.py.in \
sed -e s/__VERSION__/$(IPA_VERSION)/ ipa-python/setup.py.in \
> ipa-python/setup.py > ipa-python/setup.py
sed s/__VERSION__/$(IPA_VERSION)/ ipa-python/version.py.in \ sed -e s/__VERSION__/$(IPA_VERSION)/ ipa-python/version.py.in \
> ipa-python/version.py > ipa-python/version.py
perl -pi -e "s:__NUM_VERSION__:$(IPA_VERSION_MAJOR)$(IPA_VERSION_MINOR)$(IPA_VERSION_RELEASE):" ipa-python/version.py perl -pi -e "s:__NUM_VERSION__:$(IPA_VERSION_MAJOR)$(IPA_VERSION_MINOR)$(IPA_VERSION_RELEASE):" ipa-python/version.py
@ -226,16 +239,16 @@ repodata:
dist: version-update archive tarballs archive-cleanup rpms repodata dist: version-update archive tarballs archive-cleanup rpms repodata
local-dist: autogen clean version-update local-archive tarballs archive-cleanup rpms local-dist: autogen clean local-archive tarballs archive-cleanup rpms
clean: clean: version-update
@for subdir in $(SUBDIRS); do \ @for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \ (cd $$subdir && $(MAKE) $@) || exit 1; \
done done
rm -f *~ rm -f *~
distclean: distclean: version-update
@for subdir in $(SUBDIRS); do \ @for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \ (cd $$subdir && $(MAKE) $@) || exit 1; \
done done
@ -243,6 +256,10 @@ distclean:
maintainer-clean: clean maintainer-clean: clean
rm -fr rpmbuild dist rm -fr rpmbuild dist
cd ipa-server/selinux && $(MAKE) maintainer-clean
cd ipa-server && $(MAKE) maintainer-clean cd ipa-server && $(MAKE) maintainer-clean
cd ipa-client && $(MAKE) maintainer-clean cd ipa-client && $(MAKE) maintainer-clean
cd ipa-python && $(MAKE) maintainer-clean cd ipa-python && $(MAKE) maintainer-clean
cd ipa-admintools && $(MAKE) maintainer-clean
cd ipa-radius-admintools && $(MAKE) maintainer-clean
cd ipa-radius-server && $(MAKE) maintainer-clean

2
VERSION
View File

@ -20,7 +20,7 @@
######################################################## ########################################################
IPA_VERSION_MAJOR=1 IPA_VERSION_MAJOR=1
IPA_VERSION_MINOR=1 IPA_VERSION_MINOR=1
IPA_VERSION_RELEASE=0 IPA_VERSION_RELEASE=1
######################################################## ########################################################
# For 'pre' releases the version will be # # For 'pre' releases the version will be #

5
ipa-admintools/Makefile
View File

@ -35,8 +35,11 @@ install-man:
install -m 644 install -m 644
clean: clean:
rm -f *~ *.pyc ipa-admintools.spec rm -f *~ *.pyc
distclean: clean distclean: clean
rm -f ipa-admintools.spec
maintainer-clean: distclean
test: test:

4
ipa-admintools/ipa-admintools.spec.in
View File

@ -1,6 +1,6 @@
Name: ipa-admintools Name: ipa-admintools
Version: VERSION Version: __VERSION__
Release: 2%{?dist} Release: __RELEASE__%{?dist}
Summary: IPA admin tools Summary: IPA admin tools
Group: System Environment/Base Group: System Environment/Base

1
ipa-client/Makefile.am
View File

@ -74,6 +74,7 @@ MAINTAINERCLEANFILES = \
Makefile.in \ Makefile.in \
config.h.* \ config.h.* \
aclocal.m4 \ aclocal.m4 \
version.m4 \
ipa-client.spec \ ipa-client.spec \
py-compile \ py-compile \
$(NULL) $(NULL)

3
ipa-client/configure.ac
View File

@ -1,6 +1,7 @@
AC_PREREQ(2.59) AC_PREREQ(2.59)
m4_include(version.m4)
AC_INIT([ipa-client], AC_INIT([ipa-client],
[0.6.0], IPA_VERSION,
[https://hosted.fedoraproject.org/projects/freeipa/newticket]) [https://hosted.fedoraproject.org/projects/freeipa/newticket])
AC_CONFIG_SRCDIR([ipaclient/__init__.py]) AC_CONFIG_SRCDIR([ipaclient/__init__.py])

4
ipa-client/ipa-client.spec.in
View File

@ -1,6 +1,6 @@
Name: ipa-client Name: ipa-client
Version: VERSION Version: __VERSION__
Release: 1%{?dist} Release: __RELEASE__%{?dist}
Summary: IPA client Summary: IPA client
Group: System Environment/Base Group: System Environment/Base

1
ipa-client/version.m4.in Normal file
View File

@ -0,0 +1 @@
define([IPA_VERSION], [__VERSION__])

3
ipa-python/Makefile
View File

@ -13,9 +13,10 @@ install:
fi fi
clean: clean:
rm -f *~ *.pyc setup.py ipa-python.spec version.py rm -f *~ *.pyc
distclean: clean distclean: clean
rm -f setup.py ipa-python.spec version.py
maintainer-clean: distclean maintainer-clean: distclean
rm -rf build rm -rf build

4
ipa-python/ipa-python.spec.in
View File

@ -1,6 +1,6 @@
Name: ipa-python Name: ipa-python
Version: VERSION Version: __VERSION__
Release: 1%{?dist} Release: __RELEASE__%{?dist}
Summary: IPA authentication server Summary: IPA authentication server
Group: System Environment/Base Group: System Environment/Base

2
ipa-python/setup.py.in
View File

@ -52,7 +52,7 @@ def setup_package():
try: try:
setup( setup(
name = "ipa", name = "ipa",
version = "0.6.0", version = "__VERSION__",
license = "GPL", license = "GPL",
author = "Karl MacMillan, et.al.", author = "Karl MacMillan, et.al.",
author_email = "kmacmill@redhat.com", author_email = "kmacmill@redhat.com",

5
ipa-radius-admintools/Makefile
View File

@ -14,8 +14,11 @@ install:
install -m 755 ipa-findradiusprofile $(SBINDIR) install -m 755 ipa-findradiusprofile $(SBINDIR)
clean: clean:
rm -f *~ *.pyc ipa-radius-admintools.spec rm -f *~ *.pyc
distclean: clean distclean: clean
rm -f ipa-radius-admintools.spec
maintainer-clean: distclean
test: test:

4
ipa-radius-admintools/ipa-radius-admintools.spec.in
View File

@ -1,6 +1,6 @@
Name: ipa-radius-admintools Name: ipa-radius-admintools
Version: VERSION Version: __VERSION__
Release: 1%{?dist} Release: __RELEASE__%{?dist}
Summary: IPA authentication server - radius admin tools Summary: IPA authentication server - radius admin tools
Group: System Environment/Base Group: System Environment/Base

5
ipa-radius-server/Makefile
View File

@ -13,8 +13,11 @@ install:
install -m 755 ipa-radius-install $(SBINDIR) install -m 755 ipa-radius-install $(SBINDIR)
clean: clean:
rm -fr *.pyc *~ ipa-radius-server.spec rm -fr *.pyc *~
distclean: clean distclean: clean
rm -fr ipa-radius-server.spec
maintainer-clean: distclean
test: test:

4
ipa-radius-server/ipa-radius-server.spec.in
View File

@ -1,6 +1,6 @@
Name: ipa-radius-server Name: ipa-radius-server
Version: VERSION Version: __VERSION__
Release: 1%{?dist} Release: __RELEASE__%{?dist}
Summary: IPA authentication server - radius plugin Summary: IPA authentication server - radius plugin
Group: System Environment/Base Group: System Environment/Base

1
ipa-server/Makefile.am
View File

@ -62,6 +62,7 @@ MAINTAINERCLEANFILES = \
Makefile.in \ Makefile.in \
config.h.* \ config.h.* \
aclocal.m4 \ aclocal.m4 \
version.m4 \
ipa-server.spec \ ipa-server.spec \
py-compile \ py-compile \
$(NULL) $(NULL)

3
ipa-server/configure.ac
View File

@ -1,6 +1,7 @@
AC_PREREQ(2.59) AC_PREREQ(2.59)
m4_include(version.m4)
AC_INIT([ipa-server], AC_INIT([ipa-server],
[0.6.0], IPA_VERSION,
[https://hosted.fedoraproject.org/projects/freeipa/newticket]) [https://hosted.fedoraproject.org/projects/freeipa/newticket])
AC_CONFIG_SRCDIR([ipaserver/ipaldap.py]) AC_CONFIG_SRCDIR([ipaserver/ipaldap.py])

4
ipa-server/ipa-server.spec.in
View File

@ -1,6 +1,6 @@
Name: ipa-server Name: ipa-server
Version: VERSION Version: __VERSION__
Release: 3%{?dist} Release: __RELEASE__%{?dist}
Summary: IPA authentication server Summary: IPA authentication server
Group: System Environment/Base Group: System Environment/Base

6
ipa-server/selinux/Makefile
View File

@ -13,11 +13,11 @@ clean:
@for subdir in $(SUBDIRS); do \ @for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) -f $(POLICY_MAKEFILE) $@) || exit 1; \ (cd $$subdir && $(MAKE) -f $(POLICY_MAKEFILE) $@) || exit 1; \
done done
rm -f ipa-server-selinux.spec
maintainer-clean: clean
distclean: clean distclean: clean
rm -f ipa-server-selinux.spec
maintainer-clean: distclean
install: all install: all
install -d $(POLICY_DIR) install -d $(POLICY_DIR)

4
ipa-server/selinux/ipa-server-selinux.spec.in
View File

@ -1,8 +1,8 @@
%define POLICYCOREUTILSVER 1.33.12-1 %define POLICYCOREUTILSVER 1.33.12-1
Name: ipa-server-selinux Name: ipa-server-selinux
Version: VERSION Version: __VERSION__
Release: 1%{?dist} Release: __RELEASE__%{?dist}
Summary: IPA server SELinux policies Summary: IPA server SELinux policies
Group: System Environment/Base Group: System Environment/Base

1
ipa-server/version.m4.in Normal file
View File

@ -0,0 +1 @@
define([IPA_VERSION], [__VERSION__])