[flowblade] Update to 2.8

commit 0d278792b20b8b03487940dc446d889f0955c352 Author: Martin Gansser <mgansser(a)online.de&gt; Date: Mon Feb 15 18:13:39 2021 +0100 Update to 2.8 .gitignore | 1 + flowblade.spec | 17 ++++++++--------- flowblade_sys_path.patch | 20 +++++++++----------- sources | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-) --- diff --git a/.gitignore b/.gitignore index 638b29e..27d9b96 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /flowblade-2.6.1.tar.gz /flowblade-2.6.2.tar.gz /flowblade-2.6.3.tar.gz +/flowblade-2.8.tar.gz diff --git a/flowblade.spec b/flowblade.spec index 1d13b63..d15e3b4 100644 --- a/flowblade.spec +++ b/flowblade.spec @@ -12,8 +12,8 @@ Name: flowblade Version: 2.4.0.1 Release: 4%{?dist} %else -Version: 2.6.3 -Release: 2%{?dist} +Version: 2.8 +Release: 1%{?dist} %endif License: GPLv3 Summary: Multitrack non-linear video editor for Linux @@ -64,12 +64,9 @@ Flowblade provides powerful tools to mix and filter video and audio. %if 0%{?usesnapshot} %setup -qn %{name}-%{commit0} %else -%setup -q -n %{name}-%{version} +%autosetup -p0 -n %{name}-%{version} %endif -# fix to /usr/bin/flowblade -%patch0 -p1 - # fix wrong-script-interpreter errors 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 @@ -77,7 +74,6 @@ sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/python3|g' flowblade-trunk/Flowbla # fix to %%{_datadir}/locale sed -i "s|respaths.LOCALE_PATH|'%{_datadir}/locale'|g" flowblade-trunk/Flowblade/translations.py - %build cd flowblade-trunk %py3_build @@ -109,7 +105,7 @@ cp Flowblade/res/css/gtk-flowblade-dark.css %{buildroot}%{python3_sitelib}/Flowb %check desktop-file-validate %{buildroot}%{_datadir}/applications/%{unique_name}.desktop -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml %files -f flowblade-trunk/%{name}.lang %doc flowblade-trunk/README @@ -118,12 +114,15 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/applications/%{unique_name}.desktop %{_mandir}/man1/%{name}.1.* %{_datadir}/mime/packages/%{unique_name}.xml -%{_datadir}/appdata/%{unique_name}.appdata.xml +%{_datadir}/metainfo/%{unique_name}.appdata.xml %{_datadir}/icons/hicolor/128x128/apps/%{unique_name}.png %{python3_sitelib}/Flowblade/ %{python3_sitelib}/%{name}* %changelog +* Mon Feb 15 2021 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 2.8.1 +- Update to 2.8 + * Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 2.6.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/flowblade_sys_path.patch b/flowblade_sys_path.patch index 2620963..b59e44b 100644 --- a/flowblade_sys_path.patch +++ b/flowblade_sys_path.patch @@ -1,21 +1,19 @@ ---- ./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": +--- flowblade-trunk/flowblade.orig 2021-02-15 17:46:41.584404702 +0100 ++++ flowblade-trunk/flowblade 2021-02-15 17:52:37.697270687 +0100 +@@ -36,10 +36,10 @@ + # - When running on distro. + if os.path.realpath(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 @@ - 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. + # - When running in flatpak. + elif launch_dir == "/app/bin": + print ("Running from Flatpak installation...") +@@ -51,6 +51,7 @@ else: print ("Running from filesystem...") modules_path = launch_dir + "/Flowblade" diff --git a/sources b/sources index d9eaf4b..8d6f4a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (flowblade-2.6.3.tar.gz) = 4296b9d148092020966a93b61581edf0efa473185357241bd17d1c0b2b08c48fd980f7c29852d9234e433a5a5e9a57c5443e84e6511dedf35520ace661fa2330 +SHA512 (flowblade-2.8.tar.gz) = 162da4cb0870a92b47834cbbd918f3671ea3a0b6883c59fb3df4d2f7c1fd047d527ba0dbdccdf8932a1e894fe5df8f4ef45cdd6f3155c26ceada0db451d2e5bf