Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 50ad0e41cdde95497ffe303d52d8e13a27370e0d 1 parent f4b4560
@gozer gozer authored
Showing with 3 additions and 3 deletions.
  1. +1 −1  Makefile
  2. +1 −1  f1.spec.in
  3. +1 −1  tools/makespec
View
2  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)
View
2  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
View
2  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}-";
Please sign in to comment.
Something went wrong with that request. Please try again.