summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Uiterwijk <puiterwijk@redhat.com>2015-03-16 15:16:03 +0100
committerRob Crittenden <rcritten@redhat.com>2015-03-16 17:47:50 -0400
commitcd855ea000e6baa994423c486779935bd02a6426 (patch)
tree153bb520d6b78154b0739a1fd6784bf513cb55d1
parent2667fc13306912d4a1481e495181679012255ef6 (diff)
downloadipsilon-cd855ea000e6baa994423c486779935bd02a6426.tar.gz
ipsilon-cd855ea000e6baa994423c486779935bd02a6426.tar.xz
ipsilon-cd855ea000e6baa994423c486779935bd02a6426.zip
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 <puiterwijk@redhat.com> Reviewed-by: Rob Crittenden <rcritten@redhat.com>
-rw-r--r--Makefile9
-rw-r--r--contrib/fedora/ipsilon.spec2
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