From cd855ea000e6baa994423c486779935bd02a6426 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 16 Mar 2015 15:16:03 +0100 Subject: [PATCH] Build dated RPMs by default This stores the build date and git commit in the version. This way, it's a lot easier to determine when it was last built. Signed-off-by: Patrick Uiterwijk Reviewed-by: Rob Crittenden --- Makefile | 9 +++++++-- contrib/fedora/ipsilon.spec | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f39b26f..662c893 100644 --- a/Makefile +++ b/Makefile @@ -89,9 +89,14 @@ rpmdistdir: rpms: rpmroot rpmdistdir sdist cp dist/ipsilon*.tar.gz $(RPMBUILD)/SOURCES/ - rpmbuild --define "_topdir $(RPMBUILD)" -ba contrib/fedora/ipsilon.spec + rpmbuild --define "gittag .git`git rev-parse --short HEAD`" --define "builddate .`date +%Y%m%d%H%M`" --define "_topdir $(RPMBUILD)" -ba contrib/fedora/ipsilon.spec mv $(RPMBUILD)/RPMS/*/ipsilon-*.rpm dist/rpms/ mv $(RPMBUILD)/SRPMS/ipsilon-*.src.rpm dist/srpms/ rm -rf $(RPMBUILD) -rpms: sdist +releaserpms: rpmroot rpmdistdir sdist + cp dist/ipsilon*.tar.gz $(RPMBUILD)/SOURCES/ + rpmbuild --define "_topdir $(RPMBUILD)" -ba contrib/fedora/ipsilon.spec + mv $(RPMBUILD)/RPMS/*/ipsilon-*.rpm dist/rpms/ + mv $(RPMBUILD)/SRPMS/ipsilon-*.src.rpm dist/srpms/ + rm -rf $(RPMBUILD) diff --git a/contrib/fedora/ipsilon.spec b/contrib/fedora/ipsilon.spec index b435a8f..a5acd0d 100644 --- a/contrib/fedora/ipsilon.spec +++ b/contrib/fedora/ipsilon.spec @@ -2,7 +2,7 @@ Name: ipsilon Version: 0.4.0 -Release: 1%{?dist} +Release: 1%{?builddate}%{?gittag}%{?dist} Summary: An Identity Provider Server Group: System Environment/Base -- 2.20.1