[flowblade] Update to 2.4-1 Switched to python3

commit 725736aa97348584e31c087e31754f246beb6702 Author: Martin Gansser <mgansser(a)online.de&gt; Date: Fri Dec 13 10:03:25 2019 +0100 Update to 2.4-1 Switched to python3 .gitignore | 1 + flowblade.spec | 54 ++++++++++++++++++++++-------------------------- flowblade_sys_path.patch | 24 ++++++++++----------- sources | 2 +- 4 files changed, 39 insertions(+), 42 deletions(-) --- diff --git a/.gitignore b/.gitignore index 4976139..25f7a2e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /flowblade-1.16.0-4c25c3c.tar.gz /flowblade-2.0.tar.gz /flowblade-2.2.tar.gz +/flowblade-2.4.tar.gz diff --git a/flowblade.spec b/flowblade.spec index bad557a..daaa402 100644 --- a/flowblade.spec +++ b/flowblade.spec @@ -9,10 +9,10 @@ Name: flowblade %if 0%{?usesnapshot} -Version: 2.2 +Version: 2.4 Release: 1%{?dist} %else -Version: 2.2 +Version: 2.4 Release: 1%{?dist} %endif License: GPLv3 @@ -27,28 +27,20 @@ Patch0: flowblade_sys_path.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib -BuildRequires: python2-devel -BuildRequires: python2-setuptools +BuildRequires: python3-devel +BuildRequires: python3-setuptools Requires: ffmpeg -Requires: python2-mlt +Requires: python3-mlt Requires: frei0r-plugins >= 1.4 Requires: gmic Requires: gtk3 # This dependency isn't available anymore since f30 -%if 0%{?fedora} && 0%{?fedora} < 30 -Requires: ladspa-swh-plugins -%endif Requires: ladspa-calf-plugins Requires: librsvg2 -Requires: python2-numpy -Requires: python2-pillow -%if 0%{?fedora} >= 28 -Requires: python2-dbus -Requires: python2-gobject -%else -Requires: python-dbus -Requires: python-gobject -%endif +Requires: python3-numpy +Requires: python3-pillow +Requires: python3-dbus +Requires: python3-gobject Requires: mlt-freeworld Requires: shared-mime-info%{?_isa} @@ -79,8 +71,8 @@ Flowblade provides powerful tools to mix and filter video and audio. %patch0 -p1 # fix wrong-script-interpreter errors -sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/python2|g' flowblade-trunk/Flowblade/launch/* -sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/python2|g' flowblade-trunk/Flowblade/tools/clapperless.py +sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/python3|g' flowblade-trunk/Flowblade/launch/* +sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/python3|g' flowblade-trunk/Flowblade/tools/clapperless.py # fix to %%{_datadir}/locale sed -i "s|respaths.LOCALE_PATH|'%{_datadir}/locale'|g" flowblade-trunk/Flowblade/translations.py @@ -88,30 +80,30 @@ sed -i "s|respaths.LOCALE_PATH|'%{_datadir}/locale'|g" flowblade-trunk/Flowblade %build cd flowblade-trunk -%py2_build +%py3_build %install cd flowblade-trunk -%py2_install +%py3_install # fix permissions -chmod +x %{buildroot}%{python2_sitelib}/Flowblade/launch/* +chmod +x %{buildroot}%{python3_sitelib}/Flowblade/launch/* # setup of mime is already done, so for what we need this file ? rm %{buildroot}/usr/lib/mime/packages/flowblade # move .mo files to /usr/share/locale the right place -for i in $(ls -d %{buildroot}%{python2_sitelib}/Flowblade/locale/*/LC_MESSAGES/ | sed 's/\(^.*locale\/\)\(.*\)\(\/LC_MESSAGES\/$\)/\2/') ; do +for i in $(ls -d %{buildroot}%{python3_sitelib}/Flowblade/locale/*/LC_MESSAGES/ | sed 's/\(^.*locale\/\)\(.*\)\(\/LC_MESSAGES\/$\)/\2/') ; do mkdir -p %{buildroot}%{_datadir}/locale/$i/LC_MESSAGES/ - mv %{buildroot}%{python2_sitelib}/Flowblade/locale/$i/LC_MESSAGES/%{name}.mo \ + mv %{buildroot}%{python3_sitelib}/Flowblade/locale/$i/LC_MESSAGES/%{name}.mo \ %{buildroot}%{_datadir}/locale/$i/LC_MESSAGES/ done # E: non-executable-script -chmod a+x %{buildroot}%{python2_sitelib}/Flowblade/tools/clapperless.py +chmod a+x %{buildroot}%{python3_sitelib}/Flowblade/tools/clapperless.py -install -d -m 0755 %{buildroot}%{python2_sitelib}/Flowblade/res/css -cp Flowblade/res/css/gtk-flowblade-dark.css %{buildroot}%{python2_sitelib}/Flowblade/res/css +install -d -m 0755 %{buildroot}%{python3_sitelib}/Flowblade/res/css +cp Flowblade/res/css/gtk-flowblade-dark.css %{buildroot}%{python3_sitelib}/Flowblade/res/css %find_lang %{name} @@ -128,10 +120,14 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/mime/packages/%{unique_name}.xml %{_datadir}/appdata/%{unique_name}.appdata.xml %{_datadir}/icons/hicolor/128x128/apps/%{unique_name}.png -%{python2_sitelib}/Flowblade/ -%{python2_sitelib}/%{name}* +%{python3_sitelib}/Flowblade/ +%{python3_sitelib}/%{name}* %changelog +* Fri Dec 13 2019 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 2.4-1 +- Update to 2.4-1 +- Switched to python3 + * Thu Sep 12 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 2.2-1 - Update Flowblade to 2.2 diff --git a/flowblade_sys_path.patch b/flowblade_sys_path.patch index 36320f1..2620963 100644 --- a/flowblade_sys_path.patch +++ b/flowblade_sys_path.patch @@ -1,25 +1,25 @@ ---- ./flowblade-trunk/flowblade.orig 2019-08-26 08:46:04.000000000 +0100 -+++ ./flowblade-trunk/flowblade 2019-09-12 23:38:15.039286989 +0100 -@@ -36,7 +36,8 @@ print "Launch script dir:", launch_dir - # When running on distro - if launch_dir in {"bin", "/usr/bin", "/usr/local/bin"}: - print "Running from installation..." +--- ./flowblade-trunk/flowblade.orig 2019-12-13 09:18:10.874337994 +0100 ++++ ./flowblade-trunk/flowblade 2019-12-13 09:21:34.887354575 +0100 +@@ -36,7 +36,8 @@ + # When running on distro. + if launch_dir == "/usr/bin": + print ("Running from installation...") - modules_path = "/usr/share/flowblade/Flowblade" + from distutils.sysconfig import get_python_lib + modules_path = "%s/Flowblade" % get_python_lib() if not os.path.isdir(modules_path): modules_path = "/usr/share/pyshared/Flowblade" - print "modules path:", modules_path -@@ -46,11 +47,11 @@ elif launch_dir == "/app/bin": + print ("modules path:", modules_path) +@@ -46,11 +47,11 @@ modules_path = "/app/share/flowblade/Flowblade" if not os.path.isdir(modules_path): modules_path = "/app/share/pyshared/Flowblade" -- print "modules path:", modules_path - # When running in filesystem +- print ("modules path:", modules_path) + # When running in filesystem. else: - print "Running from filesystem..." + print ("Running from filesystem...") modules_path = launch_dir + "/Flowblade" -+ print "modules path:", modules_path ++ print ("modules path:", modules_path) sys.path.insert(0, modules_path) diff --git a/sources b/sources index 01b7937..2b83666 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43fc5f8a6799994e25a4557345786142 flowblade-2.2.tar.gz +SHA512 (flowblade-2.4.tar.gz) = 5e0b4c7cfa91bbeb58dfec7035e2ac46dcca2e1634f1ff5d2028b6e7d166ea5f118143378f36b234df11a9985f917a803e53439c60f639ae57c33d10efbe1987