7:05 p.m.
commit 9c1bba5f9199c32f56642757202fadfb949652a4
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Jan 16 13:03:23 2018 -0600
Update to v29.0-77-g771115f47d from branch fixes/29
.gitignore | 1 +
latest_fixes.sh | 13 +++++++++++++
mythtv.spec | 24 ++++++++++++------------
sources | 2 +-
4 files changed, 27 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 769c918..5995879 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ mythtv-0.27.5.tar.gz
/mythtv-0.28.tar.gz
/mythtv-0.28.1.tar.gz
/mythtv-29.0.tar.gz
+/mythtv-29.0-771115f47d.tar.gz
diff --git a/latest_fixes.sh b/latest_fixes.sh
new file mode 100755
index 0000000..b96936f
--- /dev/null
+++ b/latest_fixes.sh
@@ -0,0 +1,13 @@
+git clone git://github.com/MythTV/mythtv.git
+version=29.0
+branch=fixes/29
+pushd mythtv
+git checkout $branch
+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/")
+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
diff --git a/mythtv.spec b/mythtv.spec
index e9d4410..6361121 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -60,8 +60,9 @@
%define desktop_vendor RPMFusion
# MythTV Version string -- preferably the output from git describe
-%define vers_string v29.0-71-g339b08e467
-%define rel_string .20171226.71.g339b08e467
+%define vers_string v29.0-77-g771115f47d
+%define rel_string .20180111.77.g771115f47d
+%define shortcommit %(c=%{vers_string}; echo ${c:(-10)})
%define branch fixes/29.0
@@ -78,13 +79,8 @@ Name: mythtv
Summary: A digital video recorder (DVR) application
URL: http://www.mythtv.org/
-# Version/Release info
Version: 29.0
-%if "%{branch}" == "master"
-Release: 0.7.git.%{_gitrev}%{?dist}
-%else
-Release: 6%{?rel_string}%{?dist}
-%endif
+Release: 7%{?rel_string}%{?dist}
# The primary license is GPLv2+, but bits are borrowed from a number of
# projects... For a breakdown of the licensing, see PACKAGE-LICENSING.
@@ -130,14 +126,15 @@ License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and
(GPLv2+ or
################################################################################
-Source0:
https://github.com/MythTV/%{name}/archive/v%{version}.tar.gz#/%{name}-%{v...
+Source0:
https://github.com/MythTV/%{name}/archive/%{shortcommit}/%{name}-%{versio...
+#
+### THE BELOW IS NOW AUTOMATED BY SCRIPTS IN SCM ###
+#
# From the mythtv git repository with the appropriate branch checked out:
# Example: git diff -p --stat v0.26.0 > mythtv-0.26-fixes.patch
# Also update ChangeLog with git log v0.28..HEAD > ChangeLog
# and update define vers_string to v0.28-52-ge6a60f7 with git describe
-Patch0: mythtv-fixes.patch
-Patch1: mythtv-qmake.patch
Source10: PACKAGE-LICENSING
Source11: ChangeLog
@@ -1377,8 +1374,11 @@ exit 0
%changelog
+* Tue Jan 16 2018 Richard Shaw <hobbes1069(a)gmail.com> -
29.0-7.20180111.77.g771115f47d
+- Update to v29.0-77-g771115f47d from branch fixes/29
+
* Sun Dec 31 2017 Sérgio Basto <sergio(a)serjux.com> -
29.0-6.20171226.71.g339b08e467
-- Update to v29.0-71-g339b08e467 from branch fixes/29
+- Update to v29.0-71-g339b08e467 from branch fixes/29.
* Sun Dec 31 2017 Sérgio Basto <sergio(a)serjux.com> - 29.0-5
- Mass rebuild for x264 and x265
diff --git a/sources b/sources
index 21762d1..08cb5de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0f200127980888632e6c85736c609835 mythtv-29.0.tar.gz
+e51b3d333cab1255ca245f561ca7c1ea mythtv-29.0-771115f47d.tar.gz