commit e6daf6dba169ca83edba60eb182551618f683841 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Fri Oct 5 06:20:53 2018 +0100 Update to 29.1.39.20181004git74fff5c285 from branch fixes/29 .gitignore | 1 + mythtv.spec | 11 +++++++---- sources | 2 +- update_fixes.sh | 6 +++--- 4 files changed, 12 insertions(+), 8 deletions(-) --- diff --git a/.gitignore b/.gitignore index 13768b7..8ba9dc3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ mythtv-0.27.5.tar.gz /mythtv-29.1-1777cc4425.tar.gz /mythtv-29.1-2a0dadb37c.tar.gz /mythtv-29.1-dde16d475a.tar.gz +/mythtv-29.1-74fff5c285.tar.gz diff --git a/mythtv.spec b/mythtv.spec index 27372c9..8475a00 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 dde16d475a8d76490324fb32ce905a3145d26a50 +%define githash 74fff5c2856d592b8b2dfd41ac5cc08f372a8993 %define shorthash %(c=%{githash}; echo ${c:0:10}) -%define vers_string v29.1-36-gdde16d475a -%define rel_string .36.20180907.gdde16d475a +%define vers_string v29.1-39-g74fff5c285 +%define rel_string .39.20181004git74fff5c285 %define branch fixes/29 @@ -72,7 +72,7 @@ # Name: mythtv Version: 29.1 -Release: 24%{?rel_string}%{?dist} +Release: 25%{?rel_string}%{?dist} Summary: A digital video recorder (DVR) application # The primary license is GPLv2+, but bits are borrowed from a number of @@ -1399,6 +1399,9 @@ exit 0 %changelog +* Fri Oct 05 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 29.1-25.39.20181004git74fff5c285 +- Update to 29.1.39.20181004git74fff5c285 from branch fixes/29 + * Thu Oct 04 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 29.1-24.36.20180907.gdde16d475a - Mass rebuild for x264 and/or x265 diff --git a/sources b/sources index 91110e4..23a76e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f56ed7fe1c27f0a1f404e7bdf7a655a mythtv-29.1-dde16d475a.tar.gz +1d76f62d8c7beb9eb10f015a26995304 mythtv-29.1-74fff5c285.tar.gz diff --git a/update_fixes.sh b/update_fixes.sh index 4a57f07..c4960da 100755 --- a/update_fixes.sh +++ b/update_fixes.sh @@ -6,10 +6,10 @@ branch=fixes/29 pushd mythtv git checkout $branch git pull -git log v$version..HEAD > ../ChangeLog +#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/\.g/.$date.g/") +relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/\.g/.${date}git/") githash=$(git rev-parse HEAD) shorthash=$(echo $githash | cut -b -10) popd @@ -19,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 v$version$relversion from branch $branch " 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}-${shorthash}.tar.gz; read dummy; rfpkg new-sources mythtv-${version}-${shorthash}.tar.gz