Merge branch 'master' into senslab2

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index 4f1b51a..701c329 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,13 @@ uninstall: python-uninstall tests-uninstall
 
 .PHONY: all install clean uninstall
 
-VERSIONTAG=0.0-0-should.be-redefined-by-specfile
+##########
+rpmversion:=$(shell rpm -q --specfile sfa.spec --queryformat="%{version}\n" | head -1)
+# somehow %{taglevel} is empty, turns out %{release} has what we want
+rpmtaglevel:=$(shell rpm -q --specfile sfa.spec --queryformat="%{release}\n" 2> /dev/null | head -1)
+VERSIONTAG=$(rpmversion)-$(rpmtaglevel)
 SCMURL=should-be-redefined-by-specfile
 
-##########
 python: version
 
 version: sfa/util/version.py
@@ -143,5 +146,10 @@ else
        $(SSHCOMMAND) exec service sfa restart
 endif
 
+# 99% of the time this is enough
+fastsync:
+       +$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/
+       $(SSHCOMMAND) exec service sfa restart
+
 .PHONY: sync
 ##########