[openshot] Update to git HEAD for Blender 2.80 support

commit 28e6406aef623bc880db619cc78dc2e40b82236f Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com&gt; Date: Wed Oct 2 04:58:30 2019 -0400 Update to git HEAD for Blender 2.80 support .gitignore | 1 + openshot-rpmfusion-contact.patch | 24 ++++++++++++++++++------ openshot.spec | 27 +++++++++++++++++++++------ sources | 2 +- 4 files changed, 41 insertions(+), 13 deletions(-) --- diff --git a/.gitignore b/.gitignore index ba89234..9bbd871 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ openshot-1.4.3.tar.gz /openshot-qt-2.4.2.tar.gz /openshot-qt-2.4.3.tar.gz /openshot-qt-2.4.4.tar.gz +/openshot-qt-5f08a30.tar.gz diff --git a/openshot-rpmfusion-contact.patch b/openshot-rpmfusion-contact.patch index 02c162b..3200e43 100644 --- a/openshot-rpmfusion-contact.patch +++ b/openshot-rpmfusion-contact.patch @@ -1,10 +1,22 @@ -diff --git a/xdg/openshot-qt.appdata.xml b/xdg/openshot-qt.appdata.xml -index 69d500fd..133be097 100644 ---- a/xdg/openshot-qt.appdata.xml -+++ b/xdg/openshot-qt.appdata.xml -@@ -73,4 +73,5 @@ +From 94ae0e834373060f8a750d8236f68b3b0f584152 Mon Sep 17 00:00:00 2001 +From: "FeRD (Frank Dana)" <ferdnyc(a)gmail.com&gt; +Date: Mon, 16 Sep 2019 21:31:49 -0400 +Subject: [PATCH] Update AppData file with rpmfusion contact info + +--- + xdg/org.openshot.OpenShot.appdata.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/xdg/org.openshot.OpenShot.appdata.xml b/xdg/org.openshot.OpenShot.appdata.xml +index ae2cba9..b479169 100644 +--- a/xdg/org.openshot.OpenShot.appdata.xml ++++ b/xdg/org.openshot.OpenShot.appdata.xml +@@ -74,4 +74,5 @@ <release version="2.4.2" date="2018-06-30"/> <release version="2.4.1" date="2017-11-12"/> </releases> -+ <update_contact&gt;openshot-owner(a)rpmfusion.org&lt;/update_contact&gt; ++ <update_contact&gt;openshot-owner(a)rpmfusion.org&lt;/update_contact&gt; </component> +-- +2.21.0 + diff --git a/openshot.spec b/openshot.spec index a6034c3..99c45f2 100644 --- a/openshot.spec +++ b/openshot.spec @@ -1,16 +1,27 @@ +# Git information for unreleased build +# +# Note: Building from development tree because with the release +# of Blender 2.8 in the fedora repos, OpenShot's animated-title feature +# is no longer compatible with the available blender version. OpenShot's +# Blender-2.80-compatible code has been committed, but not yet released +%global gitrev 5f08a30102b55e16aaf898dd641732c46c52d528 +%global shortrev %(c=%{gitrev}; echo ${c:0:7}) +%global gitdate 20191002 + # Redirect find_lang to our patched version %global find_lang %{_sourcedir}/openshot-find-lang.sh %{buildroot} Name: openshot Version: 2.4.4 -Release: 3%{?dist} +Release: 4.%{gitdate}git%{shortrev}%{?dist} Summary: Create and edit videos and movies Group: Applications/Multimedia License: GPLv3+ URL: http://www.openshot.org -Source0: https://github.com/OpenShot/%{name}-qt/archive/v%{version}/%{name}-qt-%{v... +#Source0: https://github.com/OpenShot/%{name}-qt/archive/v%{version}/%{name}-qt-%{v... +Source0: https://github.com/OpenShot/%{name}-qt/archive/%{gitrev}.tar.gz#/%{name}-... # QT translation files are installed to a non-standard location Source100: openshot-find-lang.sh @@ -42,7 +53,7 @@ Requires: ffmpeg-libs %if 0%{?fedora} Recommends: openshot-lang Recommends: font(bitstreamverasans) -Recommends: blender +Recommends: blender >= 2.80 %else Requires: openshot-lang %endif @@ -75,7 +86,7 @@ Requires: %{name} = %{version}-%{release} %prep -%autosetup -p1 -n %{name}-qt-%{version} +%autosetup -p1 -n %{name}-qt-%{gitrev} %build @@ -96,7 +107,7 @@ do done # Validate desktop file -desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-qt.desktop +desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop %if 0%{?rhel} # Move appdata file to default location @@ -129,7 +140,7 @@ fi %license COPYING %doc AUTHORS README.md %{_bindir}/* -%{_datadir}/applications/%{name}-qt.desktop +%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/pixmaps/* %{_datadir}/mime/packages/* @@ -146,6 +157,10 @@ fi %changelog +* Mon Sep 16 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com&gt; - 2.4.4-4 +- Update to git HEAD for compatibility with new Blender 2.80 release +- Handle renamed metadata files + * Wed Aug 07 2019 Leigh Scott <leigh123linux(a)gmail.com&gt; - 2.4.4-3 - Rebuild for new ffmpeg version diff --git a/sources b/sources index 078097c..aa6a3ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6addaf63691bd9bbe75a2fb854997bbe openshot-qt-2.4.4.tar.gz +469d5388dfe3ed959ac0ef174759c8c1 openshot-qt-5f08a30.tar.gz