[flowblade] Update Flowblade to 2.2

commit 542880f0bd6d687cddc24fb801b263c46590499c Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Thu Sep 12 23:51:27 2019 +0100 Update Flowblade to 2.2 .gitignore | 1 + flowblade.spec | 11 +++++++---- flowblade_sys_path.patch | 10 +++++----- sources | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) --- diff --git a/.gitignore b/.gitignore index b3d8b6c..4976139 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /flowblade-1.16.0-3fdb76d.tar.gz /flowblade-1.16.0-4c25c3c.tar.gz /flowblade-2.0.tar.gz +/flowblade-2.2.tar.gz diff --git a/flowblade.spec b/flowblade.spec index 357f50b..bad557a 100644 --- a/flowblade.spec +++ b/flowblade.spec @@ -9,11 +9,11 @@ Name: flowblade %if 0%{?usesnapshot} -Version: 2.0 -Release: 5.git%{?snapshottag}%{?dist} +Version: 2.2 +Release: 1%{?dist} %else -Version: 2.0 -Release: 5%{?dist} +Version: 2.2 +Release: 1%{?dist} %endif License: GPLv3 Summary: Multitrack non-linear video editor for Linux @@ -132,6 +132,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{python2_sitelib}/%{name}* %changelog +* Thu Sep 12 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 2.2-1 +- Update Flowblade to 2.2 + * Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/flowblade_sys_path.patch b/flowblade_sys_path.patch index ceb3204..36320f1 100644 --- a/flowblade_sys_path.patch +++ b/flowblade_sys_path.patch @@ -1,8 +1,8 @@ ---- flowblade-2.0/flowblade-trunk/flowblade.orig 2019-02-04 13:10:26.894134599 +0100 -+++ flowblade-2.0/flowblade-trunk/flowblade 2019-02-04 13:13:08.284504048 +0100 -@@ -36,7 +36,8 @@ +--- ./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 == "/usr/bin": + if launch_dir in {"bin", "/usr/bin", "/usr/local/bin"}: print "Running from installation..." - modules_path = "/usr/share/flowblade/Flowblade" + from distutils.sysconfig import get_python_lib @@ -10,7 +10,7 @@ if not os.path.isdir(modules_path): modules_path = "/usr/share/pyshared/Flowblade" print "modules path:", modules_path -@@ -46,11 +47,11 @@ +@@ -46,11 +47,11 @@ elif launch_dir == "/app/bin": modules_path = "/app/share/flowblade/Flowblade" if not os.path.isdir(modules_path): modules_path = "/app/share/pyshared/Flowblade" diff --git a/sources b/sources index 9788c30..01b7937 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d97ad242255705001cdb9707f0f70ff flowblade-2.0.tar.gz +43fc5f8a6799994e25a4557345786142 flowblade-2.2.tar.gz