summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2010-10-25 13:57:13 -0400
committerStephen Gallagher <sgallagh@redhat.com>2010-10-26 08:00:21 -0400
commit13147b598a8409c338abb9472e74bbd606f224bd (patch)
treeef3b25d1669b534c43e188c4fca2e62657019e80
parentae3de4019070ebf9a4ce622d613d82358e3d72ef (diff)
downloadsssd-13147b598a8409c338abb9472e74bbd606f224bd.tar.gz
sssd-13147b598a8409c338abb9472e74bbd606f224bd.tar.bz2
sssd-13147b598a8409c338abb9472e74bbd606f224bd.zip
Improve versioning for automated builds
Also changes 'make srpms' and 'make prerelease-srpms' to 'make srpm' and 'make prerelease-srpm', as we are only building one SRPM.
-rw-r--r--Makefile.am10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 294b1741..a81a2eeb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1122,14 +1122,14 @@ rpms: dist-gzip rpmroot
if GIT_CHECKOUT
prerelease-rpms:
cp $(srcdir)/version.m4 $(srcdir)/version.m4.orig
- sed -e "s/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.*\])/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.`date +%Y%m%d%H`git`git log -1 --pretty=format:%h`\])/" < $(srcdir)/version.m4.orig > $(srcdir)/version.m4
+ sed -e "s/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.*\])/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.`date +%Y%m%d.%H%M`.git`git log -1 --pretty=format:%h`\])/" < $(srcdir)/version.m4.orig > $(srcdir)/version.m4
$(MAKE) rpms
mv $(srcdir)/version.m4.orig $(srcdir)/version.m4
endif
# make srpms will use the old digest algorithm to be compatible
# with RHEL5
-srpms: dist-gzip rpmroot
+srpm: dist-gzip rpmroot
cp $(builddir)/contrib/sssd.spec $(RPMBUILD)/SPECS
cp $(distdir).tar.gz $(RPMBUILD)/SOURCES
cd $(RPMBUILD); \
@@ -1138,10 +1138,10 @@ srpms: dist-gzip rpmroot
-bs SPECS/sssd.spec
if GIT_CHECKOUT
-prerelease-srpms:
+prerelease-srpm:
cp $(srcdir)/version.m4 $(srcdir)/version.m4.orig
- sed -e "s/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.*\])/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.`date +%Y%m%d%H`git`git log -1 --pretty=format:%h`\])/" < $(srcdir)/version.m4.orig > $(srcdir)/version.m4
- $(MAKE) srpms
+ sed -e "s/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.*\])/m4_define(\[PRERELEASE_VERSION_NUMBER\], \[.`date +%Y%m%d.%H%M`.git`git log -1 --pretty=format:%h`\])/" < $(srcdir)/version.m4.orig > $(srcdir)/version.m4
+ $(MAKE) srpm
mv $(srcdir)/version.m4.orig $(srcdir)/version.m4
endif