commit b283f4ec9ecd7a3853709d3d5aef117f0bf32b99 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sun Jan 21 23:39:54 2018 +0000 fixes on update_fixes.sh and mythtv.spec cleanup mythtv.spec | 3 --- update_fixes.sh | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) --- diff --git a/mythtv.spec b/mythtv.spec index d2ffe3a..8b819b9 100644 --- a/mythtv.spec +++ b/mythtv.spec @@ -67,9 +67,6 @@ %define branch fixes/29.0 -# Git revision and branch ID -%define _gitrev g5b917e8 - # Harden build as mythbackend is long running. %global _hardened_build 1 diff --git a/update_fixes.sh b/update_fixes.sh index 1443c27..a9c0ef0 100755 --- a/update_fixes.sh +++ b/update_fixes.sh @@ -11,16 +11,18 @@ relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/^/.$date/") githash=$(git rev-parse HEAD) shorthash=$(echo $githash | cut -b -10) 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 -git checkout mythtv.spec rpmdev-bumpspec -c "Update to $newdescrib 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 echo Press enter to continue; read dummy; -rfpkg clog && rfpkg ci -c && git show +rfpkg ci -c && git show echo Press enter to continue; read dummy; rfpkg push && rfpkg build --nowait echo Press enter to continue; read dummy;