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>

diff --git a/Makefile b/Makefile
index f39b26f..662c893 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -89,9 +89,14 @@ rpmdistdir:
 
 rpms: rpmroot rpmdistdir sdist
        cp dist/ipsilon*.tar.gz $(RPMBUILD)/SOURCES/
 
 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)
 
        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 (file)
--- a/contrib/fedora/ipsilon.spec
+++ b/contrib/fedora/ipsilon.spec
@@ -2,7 +2,7 @@
 
 Name:       ipsilon
 Version:    0.4.0
 
 Name:       ipsilon
 Version:    0.4.0

-Release:    1%{?dist}
+Release:    1%{?builddate}%{?gittag}%{?dist}

 Summary:    An Identity Provider Server
 
 Group:      System Environment/Base
 Summary:    An Identity Provider Server
 
 Group:      System Environment/Base