[mythtv] Update to 31.0.130.20210108git016630a35c from branch fixes/31

commit b8235ddb02970088c1f5fa6b42b4aa8a4298edc4 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sun Jan 17 16:16:19 2021 +0000 Update to 31.0.130.20210108git016630a35c from branch fixes/31 .gitignore | 1 + mythtv.spec | 11 +- sources | 1 + update_fixes.sh | 10 +- v31.0..eb3c84de5f.patch | 13779 ---------------------------------------------- 5 files changed, 14 insertions(+), 13788 deletions(-) --- diff --git a/.gitignore b/.gitignore index 493296a..86a474d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ mythtv-0.27.5.tar.gz /mythtv-30.0.tar.gz /v30.0..b774c4140b.patch /mythtv-31.0.tar.gz +/v31.0..016630a35c.patch diff --git a/mythtv.spec b/mythtv.spec index 0b1e53b..dfeb8a0 100644 --- a/mythtv.spec +++ b/mythtv.spec @@ -57,13 +57,13 @@ %global desktop_applications mythfrontend mythtv-setup # git has used to fetch fixes diff -%global githash eb3c84de5fe12831d386d15452aeb7658841e072 +%global githash 016630a35cd24d3d1e4eca11e62758161d5af92f %global shorthash %(c=%{githash}; echo ${c:0:10}) # MythTV Version string -- preferably the output from git describe -%global vers_string v31.0-118-geb3c84de5f +%global vers_string v31.0-130-g016630a35c %global rel_date 20201031 -%global rel_string .%{rel_date}git%{shorthash} +%global rel_string .130.20210108git016630a35c %global branch fixes/31 @@ -72,7 +72,7 @@ # Name: mythtv Version: 31.0 -Release: 11%{rel_string}%{?dist} +Release: 12%{rel_string}%{?dist} Summary: A digital video recorder (DVR) application # The primary license is GPLv2+, but bits are borrowed from a number of @@ -1382,6 +1382,9 @@ exit 0 %changelog +* Sun Jan 17 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 31.0-12.130.20210108git016630a35c +- Update to 31.0.130.20210108git016630a35c from branch fixes/31 + * Mon Dec 07 2020 Sérgio Basto <sergio(a)serjux.com&gt; - Fix for rfbz #5843 diff --git a/sources b/sources index 90e27b3..1f40d10 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (mythtv-31.0.tar.gz) = 8df6bf6105a073a0a019f93e22228ff8500945f57a2205ffcd7ef20a69e7d74467068b7b3b2ee0896808e54b11007273dd6a520d75a716fac146c566c4f8ae3e +SHA512 (v31.0..016630a35c.patch) = 7dce063331e6d55c182e7ab507ff67cb1174800e9c60f47789e9607087dcc0b168273cf2fcb67b74d0c98a4ee559dd48a81c50e42b8092bf2d8d404c8718af8f diff --git a/update_fixes.sh b/update_fixes.sh index d56acac..abb7525 100755 --- a/update_fixes.sh +++ b/update_fixes.sh @@ -1,8 +1,8 @@ if ! [ -d "mythtv" ]; then git clone git://github.com/MythTV/mythtv.git fi -version=29.1 -branch=fixes/29 +version=31.0 +branch=fixes/31 pushd mythtv git checkout $branch git pull @@ -16,9 +16,9 @@ popd # Clean previous modifications on mythtv.spec echo Press enter to run: Clean previous modifications on mythtv.spec; read dummy; git checkout mythtv.spec -sed -i "s|^%define vers_string .*|%define vers_string $newdescrib|" mythtv.spec -sed -i "s|^%define rel_string .*|%define rel_string $relversion|" mythtv.spec -sed -i "s|^%define githash .*|%define githash $githash|" mythtv.spec +sed -i "s|global vers_string .*|global vers_string $newdescrib|" mythtv.spec +sed -i "s|global rel_string .*|global rel_string $relversion|" mythtv.spec +sed -i "s|global githash .*|global githash $githash|" mythtv.spec rpmdev-bumpspec -c "Update to $version$relversion from branch $branch " mythtv.spec spectool -g mythtv.spec echo Press enter to run: rfpkg new-sources mythtv-${version}.tar.gz v${version}..${shorthash}.patch; read dummy;