Adapt to different versions of git and branches with '-' in their names.

Makefile

@@ -26,7 +26,7 @@ COVERAGE := coverage
 PYLINT = $(BIN_DIR)/pylint
 PKGS = linkdrop
 
-GIT_DESCRIBE := `git describe  | cut -d- -f2-3`
+GIT_DESCRIBE := `git describe --long`
 
 ifeq ($(TOPSRCDIR),)
   export TOPSRCDIR = $(shell pwd)

f1.spec.in

@@ -19,7 +19,7 @@
 
 Name:           %{f1_name_prefix}python%{pyver_sys}
 Version:        %%version%%
-Release:        4%%git%%%{?dist}
+Release:        5%%git%%%{?dist}
 Summary:        Share Links Fast.
 
 Group:          Applications/Internet

tools/makespec

@@ -8,7 +8,7 @@ my $version = shift;
 my $requires = shift;
 # The git revision
 my $git = shift;
-my ($git_cnt, $git_rev) = split('-', $git);
+my ($git_cnt, $git_rev) = (split('-', $git))[-2,-1];
 $git = $git_cnt . '.git.' . $git_rev;
 
 my $prefix = "%{f1_name_prefix}python%{pyver}-";