9:47 a.m.
commit 7a4cd9eeeee4ba816b895820f09c3e258ffc4977
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Mon Sep 24 05:46:38 2018 -0400
New upstream release 2.4.3
- Update libopenshot dependency version to new 0.2.2 release
- Drop several upstreamed build fixes
- Use upstream appdata file instead of our own
- Patch upstream appdata file for missed release tag
- Add openshot-owner(a)rpmfusion.org as update contact in appdata
- Clean up installed files
- New translations path, update find logic and packaging
.gitignore | 1 +
openshot-2.4.3-appdata.patch | 12 +++++++
openshot-qt.appdata.xml | 78 ----------------------------------------
openshot-rpmfusion-contact.patch | 10 ++++++
openshot.spec | 56 +++++++++++++++++++----------
sources | 2 +-
6 files changed, 61 insertions(+), 98 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ecbb19a..0734ded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ openshot-1.4.3.tar.gz
/openshot-qt-2.4.0.tar.gz
/openshot-qt-2.4.1.tar.gz
/openshot-qt-2.4.2.tar.gz
+/openshot-qt-2.4.3.tar.gz
diff --git a/openshot-2.4.3-appdata.patch b/openshot-2.4.3-appdata.patch
new file mode 100644
index 0000000..156721c
--- /dev/null
+++ b/openshot-2.4.3-appdata.patch
@@ -0,0 +1,12 @@
+diff --git a/xdg/openshot-qt.appdata.xml b/xdg/openshot-qt.appdata.xml
+index 71765103..69d500fd 100644
+--- a/xdg/openshot-qt.appdata.xml
++++ b/xdg/openshot-qt.appdata.xml
+@@ -69,6 +69,7 @@
+ <content_attribute
id="money-gambling">none</content_attribute>
+ </content_rating>
+ <releases>
++ <release version="2.4.3" date="2018-09-22"/>
+ <release version="2.4.2" date="2018-06-30"/>
+ <release version="2.4.1" date="2017-11-12"/>
+ </releases>
diff --git a/openshot-rpmfusion-contact.patch b/openshot-rpmfusion-contact.patch
new file mode 100644
index 0000000..02c162b
--- /dev/null
+++ b/openshot-rpmfusion-contact.patch
@@ -0,0 +1,10 @@
+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 @@
+ <release version="2.4.2" date="2018-06-30"/>
+ <release version="2.4.1" date="2017-11-12"/>
+ </releases>
++ <update_contact>openshot-owner(a)rpmfusion.org</update_contact>
+ </component>
diff --git a/openshot.spec b/openshot.spec
index 667ccc4..d6cda38 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -2,8 +2,8 @@
%global find_lang %{_sourcedir}/openshot-find-lang.sh %{buildroot}
Name: openshot
-Version: 2.4.2
-Release: 2%{?dist}
+Version: 2.4.3
+Release: 1%{?dist}
Summary: Create and edit videos and movies
Group: Applications/Multimedia
@@ -14,7 +14,14 @@ Source0:
https://github.com/OpenShot/%{name}-qt/archive/v%{version}/%{nam
# QT translation files are installed to a non-standard location
Source100: openshot-find-lang.sh
-Source101: openshot-qt.appdata.xml
+
+# Upstreamed
+#Source101: openshot-qt.appdata.xml
+
+# Import commit 42ed592b from upstream, to add forgotten 2.4.3 release tag
+Patch0: openshot-2.4.3-appdata.patch
+# Add openshot-owner@rpmfusion to appdata as update_contact
+Patch1: openshot-rpmfusion-contact.patch
BuildArch: noarch
@@ -27,13 +34,13 @@ BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: libopenshot >= 0.2.0
BuildRequires: libopenshot-audio >= 0.1.6
BuildRequires: desktop-file-utils
-# To fix icon
-BuildRequires: ImageMagick
+# To fix icon — fix upstreamed
+# BuildRequires: ImageMagick
Requires: python%{python3_pkgversion}-qt5
Requires: python%{python3_pkgversion}-qt5-webkit
Requires: python%{python3_pkgversion}-httplib2
-Requires: python%{python3_pkgversion}-libopenshot >= 0.2.0
+Requires: python%{python3_pkgversion}-libopenshot >= 0.2.2
Requires: python%{python3_pkgversion}-zmq
Requires: ffmpeg-libs
@@ -74,7 +81,7 @@ Requires: %{name} = %{version}-%{release}
%prep
-%autosetup -n %{name}-qt-%{version}
+%autosetup -p1 -n %{name}-qt-%{version}
%build
@@ -97,19 +104,17 @@ done
# Validate desktop file
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-qt.desktop
-# Install appdata file
-mkdir -p %{buildroot}%{_metainfodir}
-install -pm 0644 %{SOURCE101} %{buildroot}%{_metainfodir}/
+# Validate appdata file
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
-# Move icon files to the preferred location
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ \
- %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/
-mv %{buildroot}%{_datadir}/pixmaps/%{name}-qt.svg \
- %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
+# Move icon files to the preferred location — fixed upstream
+#mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ \
+# %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/
+#mv %{buildroot}%{_datadir}/pixmaps/%{name}-qt.svg \
+# %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
-# Provided icon is not square
-convert xdg/openshot-qt.png -virtual-pixel Transparent -set option:distort:viewport
"%[fx:max(w,h)]x%[fx:max(w,h)]-%[fx:max((h-w)/2,0)]-%[fx:max((w-h)/2,0)]"
-filter point -distort SRT 0 +repage
%{buildroot}%{_datadir}/icons/hicolor/64x64/apps/openshot-qt.png
+# Provided icon was not square — fixed upstream
+#convert xdg/openshot-qt.png -virtual-pixel Transparent -set option:distort:viewport
"%[fx:max(w,h)]x%[fx:max(w,h)]-%[fx:max((h-w)/2,0)]-%[fx:max((w-h)/2,0)]"
-filter point -distort SRT 0 +repage
%{buildroot}%{_datadir}/icons/hicolor/64x64/apps/openshot-qt.png
%find_lang OpenShot --with-qt
@@ -135,18 +140,31 @@ fi
%{_bindir}/*
%{_datadir}/applications/%{name}-qt.desktop
%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/pixmaps/*
%{_datadir}/mime/packages/*
%{_metainfodir}/*.appdata.xml
%{python3_sitelib}/%{name}_qt/
-%exclude %{python3_sitelib}/%{name}_qt/locale/*
+%exclude %{python3_sitelib}/%{name}_qt/language/*
%{python3_sitelib}/*egg-info
%{_prefix}/lib/mime/packages/openshot-qt
%files lang -f OpenShot.lang
-%dir %{python3_sitelib}/%{name}_qt/locale/*
+%dir %{python3_sitelib}/%{name}_qt/language
+%{python3_sitelib}/%{name}_qt/language/%{name}_lang.py
+%{python3_sitelib}/%{name}_qt/language/%{name}_lang.qrc
%changelog
+* Mon Sep 3 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 2.4.3-1
+- New upstream release 2.4.3
+- Update libopenshot dependency version to new 0.2.2 release
+- Drop several upstreamed build fixes
+- Use upstream appdata file instead of our own
+- Patch upstream appdata file for missed release tag
+- Add openshot-owner(a)rpmfusion.org as update contact in appdata
+- Clean up installed files
+- New translations path, update find logic and packaging
+
* Sat Sep 1 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 2.4.2-2
- Updated package description
- Rebuild for updated libopenshot (with new ImageMagick)
diff --git a/sources b/sources
index ed3f5da..4c40cb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5cdf9a71a4b02d54df18a83596c49f4 openshot-qt-2.4.2.tar.gz
+1d5dab40ee47748d1322bdd18b902171 openshot-qt-2.4.3.tar.gz