[clipgrab] Update to 3.7.1
by Martin Gansser
commit cc2964e3f0bf807c6678adbba19db91d53674e4c
Author: Martin Gansser <mgansser(a)online.de>
Date: Fri Oct 5 08:27:41 2018 +0200
Update to 3.7.1
.gitignore | 1 +
clipgrab.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 947d1df..4579a42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ clipgrab-3.5.5.tar.gz
/clipgrab-3.6.7.tar.gz
/clipgrab-3.6.8.tar.gz
/clipgrab-3.7.0.tar.gz
+/clipgrab-3.7.1.tar.gz
diff --git a/clipgrab.spec b/clipgrab.spec
index a97e796..6c8b500 100644
--- a/clipgrab.spec
+++ b/clipgrab.spec
@@ -1,5 +1,5 @@
Name: clipgrab
-Version: 3.7.0
+Version: 3.7.1
Release: 1%{?dist}
License: GPLv3 and Non-Commercial Use Only (Artwork and Trademark)
@@ -39,6 +39,9 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
%{_datadir}/applications/clipgrab.desktop
%changelog
+* Fri Oct 05 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 3.7.1-1
+- Update to 3.7.1
+
* Fri Sep 28 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 3.7.0-1
- Update to 3.7.0
diff --git a/sources b/sources
index 6741da4..bc89a5c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f54061684222239c36e8e5fa45e9d00 clipgrab-3.7.0.tar.gz
+7781b6c2f1712632d22aef712fe91b3d clipgrab-3.7.1.tar.gz
5 years, 6 months
[mythtv] Fixes ERROR: ambiguous python shebang in F30
by Sérgio M. Basto
commit 286e045ce577056d74a200ef667b918b157dbb63
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Oct 5 06:55:54 2018 +0100
Fixes ERROR: ambiguous python shebang in F30
mythtv.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index 8475a00..77fec26 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -1108,10 +1108,12 @@ pushd mythplugins
%{buildroot}%{_datadir}/mythtv/games/PC/gamelist.xml
%endif
popd
-
# And back to the build/install root
%endif
+# Fixes ERROR: ambiguous python shebang in F30
+find %{buildroot}%{_datadir}/mythtv/ -type f -name "*.py" -exec sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' {} ';'
+
%pre common
# Add the "mythtv" user, with membership in the audio and video group
@@ -1401,6 +1403,7 @@ exit 0
%changelog
* Fri Oct 05 2018 Sérgio Basto <sergio(a)serjux.com> - 29.1-25.39.20181004git74fff5c285
- Update to 29.1.39.20181004git74fff5c285 from branch fixes/29
+- Fixes ERROR: ambiguous python shebang in F30
* Thu Oct 04 2018 Sérgio Basto <sergio(a)serjux.com> - 29.1-24.36.20180907.gdde16d475a
- Mass rebuild for x264 and/or x265
5 years, 6 months
[mythtv] Update to 29.1.39.20181004git74fff5c285 from branch fixes/29
by Sérgio M. Basto
commit e6daf6dba169ca83edba60eb182551618f683841
Author: Sérgio M. Basto <sergio(a)serjux.com>
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> - 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> - 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
5 years, 6 months
[libquicktime/f29: 3/3] Update branches in update script
by Sérgio M. Basto
commit 459c21e4a8264b3d1b7cdcf492cee5318df40596
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Oct 5 06:04:25 2018 +0100
Update branches in update script
update_libquicktime.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/update_libquicktime.sh b/update_libquicktime.sh
index 90d50b3..eaf4716 100755
--- a/update_libquicktime.sh
+++ b/update_libquicktime.sh
@@ -24,8 +24,8 @@ rfpkg ci -c && git show
echo Press enter to continue; read dummy;
rfpkg push && rfpkg build --nowait
echo Press enter to continue; read dummy;
-git checkout f27 && git merge master && git push && rfpkg build --nowait; git checkout master
+git checkout f29 && git merge master && git push && rfpkg build --nowait; git checkout master
echo Press enter to continue; read dummy;
-git checkout f26 && git merge master && git push && rfpkg build --nowait; git checkout master
+git checkout f28 && git merge master && git push && rfpkg build --nowait; git checkout master
echo Press enter to continue; read dummy;
git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master
5 years, 6 months
[libquicktime/f29] (3 commits) ...Update branches in update script
by Sérgio M. Basto
Summary of changes:
57af332... Mass rebuild for x264 and/or x265 (*)
fb01f58... Update to 1.2.4.112.20180804gitfff99cd from branch master (*)
459c21e... Update branches in update script
(*) This commit already existed in another branch; no separate mail sent
5 years, 6 months