commit 062f10fe0e187733770c5654817b61f5607b4b2f Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Fri May 11 00:36:20 2018 +0100 Update to v29.1.19.20180510.g0849e99596 from branch fixes/29 ChangeLog | 9 +++++++++ mythtv.spec | 15 +++++++++------ update_fixes.sh | 8 +++++--- 3 files changed, 23 insertions(+), 9 deletions(-) --- diff --git a/ChangeLog b/ChangeLog index d88b9b2..67f6bdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +commit 0849e9959639dd8dfeab0af4ce0dfc166da1f896 +Author: David Hampton <mythtv(a)love2code.net&gt; +Date: Thu May 10 15:05:38 2018 -0400 + + Revert "Fix crash in ProgramMapTable::Create" + + This reverts commit c2fa4ba7. It is causing failed recordings on + DVB-S/S2 SAT multiplexes. + commit 5f20e4f3f7e1dc3199888e9004d91b835a78f302 Author: Peter Bennett <pbennett(a)mythtv.org&gt; Date: Wed May 9 19:22:44 2018 -0400 diff --git a/mythtv.spec b/mythtv.spec index 443b6da..c77c44d 100644 --- a/mythtv.spec +++ b/mythtv.spec @@ -57,10 +57,10 @@ %define desktop_applications mythfrontend mythtv-setup # MythTV Version string -- preferably the output from git describe -%define githash 5f20e4f3f7e1dc3199888e9004d91b835a78f302 +%define githash 0849e9959639dd8dfeab0af4ce0dfc166da1f896 %define shorthash %(c=%{githash}; echo ${c:0:10}) -%define vers_string v29.1-18-g5f20e4f3f7 -%define rel_string .20180509.18.g5f20e4f3f7 +%define vers_string v29.1-19-g0849e99596 +%define rel_string .19.20180510.g0849e99596 %define branch fixes/29 @@ -72,7 +72,7 @@ # Name: mythtv Version: 29.1 -Release: 16%{?rel_string}%{?dist} +Release: 17%{?rel_string}%{?dist} Summary: A digital video recorder (DVR) application # The primary license is GPLv2+, but bits are borrowed from a number of @@ -925,9 +925,9 @@ pushd mythtv --enable-proc-opt \ %endif %if %{with debug} - --compile-type=debug + --compile-type=debug %else - --compile-type=release + --compile-type=release %endif # Make @@ -1396,6 +1396,9 @@ exit 0 %changelog +* Thu May 10 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 29.1-17.19.20180510.g0849e99596 +- Update to v29.1.19.20180510.g0849e99596 from branch fixes/29 + * Thu May 10 2018 Richard Shaw <hobbes1069(a)gmail.com&gt; - 29.1-16.20180509.18.g5f20e4f3f7 - Update to v29.1-18-g5f20e4f3f7 from branch fixes/29 diff --git a/update_fixes.sh b/update_fixes.sh index 7fb106a..2cc7175 100755 --- a/update_fixes.sh +++ b/update_fixes.sh @@ -1,4 +1,6 @@ -#git clone git://github.com/MythTV/mythtv.git +if ! [ -d "mythtv" ]; then + git clone git://github.com/MythTV/mythtv.git +fi version=29.1 branch=fixes/29 pushd mythtv @@ -7,7 +9,7 @@ git pull git log v$version..HEAD > ../ChangeLog newdescrib=$(git describe) date=$(git log -1 --format=%cd --date=short | tr -d \-) -relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/^/.$date/") +relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/\.g/.$date.g/") githash=$(git rev-parse HEAD) shorthash=$(echo $githash | cut -b -10) popd @@ -17,7 +19,7 @@ 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 -rpmdev-bumpspec -c "Update to $newdescrib from branch $branch" mythtv.spec +rpmdev-bumpspec -c "Update to v$version$relversion from branch $branch " mythtv.spec spectool -g mythtv.spec echo Press enter to run: rfpkg new-sources mythtv-${version}-${shorthash}.tar.gz; read dummy; rfpkg new-sources mythtv-${version}-${shorthash}.tar.gz