summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2015-02-24 18:52:54 +0100
committerJan Pokorný <jpokorny@redhat.com>2015-02-26 22:40:58 +0100
commite287d4833546ec17d08a40dd6bafffe0678ad67d (patch)
treebeb6e189f9c25b188402dcd7e379ac43d2fb1b74 /misc
parente0de11a2de1fd367dca482f6e540c3743aa8ac01 (diff)
downloadclufter-e287d4833546ec17d08a40dd6bafffe0678ad67d.tar.gz
clufter-e287d4833546ec17d08a40dd6bafffe0678ad67d.tar.xz
clufter-e287d4833546ec17d08a40dd6bafffe0678ad67d.zip
clufter.spec: commit-specific run-sdist-per-commit as Source1
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to 'misc')
-rw-r--r--misc/clufter.spec12
1 files changed, 8 insertions, 4 deletions
diff --git a/misc/clufter.spec b/misc/clufter.spec
index 3fd594d..d0ff4a0 100644
--- a/misc/clufter.spec
+++ b/misc/clufter.spec
@@ -7,12 +7,15 @@
python ../setup.py --license)}}
%{!?clufter_check: %global clufter_check 1}
-# special vars wrt. version
+# special vars wrt. versioning
+%global clufter_b 1
%global clufter_version_norm %(echo '%{clufter_version}' | tr '-' '_' \\
| sed 's|\\([0-9]\\)a\\(_.*\\)\\?$|\\1|')
# http://fedoraproject.org/wiki/Packaging:NamingGuidelines#Pre-Release_packages
-%global clufter_rel %(echo '%{clufter_version}' | tr '-' '_' \\
- | sed -n 's|.*[0-9]a\\(_.*\\)\\?$|0.1.a\\1|p;tq;Q1;:q;q' || echo 1)
+%global clufter_githash %(echo '%{clufter_version}' | tr '-' '_' \\
+ | sed -n 's|.*[0-9]a_git\\.\\(.*\\)|\\1|p')
+%global clufter_rel %(echo '%{clufter_githash}' \\
+ | sed -n 'bS;:E;n;:S;s|\\(.\\+\\)|0.%{clufter_b}.a_\\1|p;tE;c\\%{clufter_b}')
%if "%{clufter_version}" == "%{clufter_version_norm}"
%{!?clufter_source: %global clufter_source %{name}-%{version}}
@@ -20,6 +23,7 @@
%{!?clufter_source: %global clufter_source %{name}-%{clufter_version}}
%endif
%{!?clufter_url_main:%global clufter_url_main https://github.com/jnpkrn/}
+%{!?clufter_url_raw: %global clufter_url_raw https://raw.githubusercontent.com/jnpkrn/}
%{!?clufter_url_dist:%global clufter_url_dist https://people.redhat.com/jpokorny/pkgs/}
%{!?clufter_pylib: %global clufter_pylib python-%{name}}
@@ -79,7 +83,7 @@ Source0: %{clufter_url_dist}%{name}/%{name}-%{version}.tar.gz
Source0: %{clufter_source}.tar.gz
# Source0 is created by Source1, just pass particular commit hash
# via GITHASH env. variable
-Source1: https://raw.githubusercontent.com/jnpkrn/clufter/master/misc/run-sdist-per-commit
+Source1: %{clufter_url_raw}%{name}/%{clufter_githash}/misc/run-sdist-per-commit
%endif