[mythtv] Fix git hash variables for %%setup.
commit becb55128a0da29838714239f3f59a6b2a0278fa
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Jan 16 16:04:19 2018 -0600
Fix git hash variables for %%setup.
latest_fixes.sh | 4 +++-
mythtv.spec | 15 +++++++--------
2 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/latest_fixes.sh b/latest_fixes.sh
index b96936f..b279fa3 100755
--- a/latest_fixes.sh
+++ b/latest_fixes.sh
@@ -7,7 +7,9 @@ git log v29.0..HEAD > ../ChangeLog
newdescrib=$(git describe)
date=$(git log -1 --format=%cd --date=short | tr -d \-)
relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/^/.$date/")
+githash=$(git rev-parse HEAD)
popd
sed -i "s|^%define vers_string .*|%define vers_string $newdescrib|"
mythtv.spec
sed -i "s|^%define rel_string .*|%define rel_string $relversion|" mythtv.spec
-rpmdev-bumpspec -c "Update to $newdescrib from branch $branch" mythtv.spec
+sed -i "s|^%define githash .*|%define githash $githash|" mythtv.spec
+#rpmdev-bumpspec -c "Update to $newdescrib from branch $branch" mythtv.spec
diff --git a/mythtv.spec b/mythtv.spec
index ac3ed4b..2acefd9 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -62,7 +62,8 @@
# MythTV Version string -- preferably the output from git describe
%define vers_string v29.0-77-g771115f47d
%define rel_string .20180111.77.g771115f47d
-%define shortcommit %(c=%{vers_string}; echo ${c:(-10)})
+%define githash 771115f47d39095652f8f660d3477008a0cbce12
+%define shorthash %(c=%{githash}; echo ${c:0:10})
%define branch fixes/29.0
@@ -76,15 +77,16 @@
# Basic descriptive tags for this package:
#
Name: mythtv
-Summary: A digital video recorder (DVR) application
-URL: http://www.mythtv.org/
-
Version: 29.0
Release: 8%{?rel_string}%{?dist}
+Summary: A digital video recorder (DVR) application
# The primary license is GPLv2+, but bits are borrowed from a number of
# projects... For a breakdown of the licensing, see PACKAGE-LICENSING.
License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+)
+URL: http://www.mythtv.org/
+Source0:
https://github.com/MythTV/%{name}/archive/%{githash}/%{name}-%{version}-%...
+
################################################################################
@@ -125,9 +127,6 @@ License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and
(GPLv2+ or
################################################################################
-
-Source0:
https://github.com/MythTV/%{name}/archive/%{shortcommit}/%{name}-%{versio...
-
#
### THE BELOW IS NOW AUTOMATED BY SCRIPTS IN SCM ###
#
@@ -802,7 +801,7 @@ on demand content.
################################################################################
%prep
-%autosetup -p1 -n %{name}-%{version}
+%autosetup -p1 -n %{name}-%{githash}
# Remove compiled python file
#find -name *.pyc -exec rm -f {} \;