Backport patch to fix appdata validation

This pulls in unnecessary library subpackages and binaries; just count on RPM's
standard library autodependencies.

.gitignore

@@ -23,3 +23,5 @@ rawtherapee-3.0-a1.tar.bz2
 /rawtherapee-5.4-rc3.tar.xz
 /rawtherapee-5.4.tar.xz
 /rawtherapee-5.5.tar.xz
+/rawtherapee-5.6-rc1.tar.xz
+/rawtherapee-5.6.tar.xz

RT_5.6_fix_appdata.patch

@@ -0,0 +1,47 @@
+From e48089daaa37ade0450b913a3f51d5dc2c50b790 Mon Sep 17 00:00:00 2001
+From: scx <scx.mail@gmail.com>
+Date: Tue, 23 Apr 2019 20:34:51 +0200
+Subject: [PATCH 1/2] AppData file: Fix releases
+
+Closes #5303
+---
+ com.rawtherapee.RawTherapee.appdata.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/com.rawtherapee.RawTherapee.appdata.xml b/com.rawtherapee.RawTherapee.appdata.xml
+index 32cfe30c7..e4fb460c2 100644
+--- a/com.rawtherapee.RawTherapee.appdata.xml
++++ b/com.rawtherapee.RawTherapee.appdata.xml
+@@ -36,8 +36,8 @@
+     <launchable type="desktop-id">rawtherapee.desktop</launchable>
+     <releases>
+         <release version="5.6" date="2019-04-20" type="stable"></release>
+-        <release version="5.6-rc2" date="2019-04-17" type="development"></release>
+-        <release version="5.6-rc1" date="2019-04-10" type="development"></release>
++        <release version="5.6~rc2" date="2019-04-17" type="development"></release>
++        <release version="5.6~rc1" date="2019-04-10" type="development"></release>
+         <release version="5.5" date="2018-12-17" type="stable"></release>
+     </releases>
+     <provides>
+
+From 01894609ce10453e420e78fa075ef10399e7f0c2 Mon Sep 17 00:00:00 2001
+From: scx <scx.mail@gmail.com>
+Date: Tue, 23 Apr 2019 20:52:14 +0200
+Subject: [PATCH 2/2] AppData file: Add OARS info
+
+---
+ com.rawtherapee.RawTherapee.appdata.xml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/com.rawtherapee.RawTherapee.appdata.xml b/com.rawtherapee.RawTherapee.appdata.xml
+index e4fb460c2..a53ccbf06 100644
+--- a/com.rawtherapee.RawTherapee.appdata.xml
++++ b/com.rawtherapee.RawTherapee.appdata.xml
+@@ -26,6 +26,7 @@
+         <keyword>pp3</keyword>
+         <keyword>graphics</keyword>
+     </keywords>
++    <content_rating type="oars-1.0" />
+     <metadata_license>CC-BY-SA-4.0</metadata_license>
+     <project_license>GPL-3.0+</project_license>
+     <url type="bugtracker">https://github.com/Beep6581/RawTherapee/issues/new</url>

rawtherapee.spec

@@ -1,6 +1,6 @@
 Name:           rawtherapee
-Version:        5.5
-Release:        1%{?dist}
+Version:        5.6
+Release:        2%{?dist}
 Summary:        Raw image processing software
 
 Group:          Applications/Multimedia 
@@ -8,6 +8,11 @@ License:        GPLv3 and MIT and IJG
 URL:            http://www.rawtherapee.com/
 Source0:        http://rawtherapee.com/shared/source/%{name}-%{version}.tar.xz
 
+# Backport patch to fix appdata validation
+# https://github.com/Beep6581/RawTherapee/issues/5303
+Patch0:         RT_5.6_fix_appdata.patch
+
+
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++
@@ -27,6 +32,7 @@ BuildRequires:  pkgconfig(libcanberra)
 BuildRequires:  pkgconfig(libiptcdata)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(librsvg-2.0)
 BuildRequires:  pkgconfig(libtiff-4)
 BuildRequires:  pkgconfig(sigc++-2.0)
 BuildRequires:  pkgconfig(zlib)
@@ -74,7 +80,7 @@ rm -rf %{buildroot}/%{_datadir}/doc
 
 %check
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/com.%{name}.RawTherapee.appdata.xml
 
 
 %files
@@ -85,12 +91,26 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.
 %{_libdir}/*.so
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/metainfo/%{name}.appdata.xml
+%{_datadir}/metainfo/com.%{name}.RawTherapee.appdata.xml
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 
 %changelog
-* Fri Dec 21 2018 Mattia Verga <mattia.verga@protonmail.com> - 5.5-1
+* Thu Apr 25 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.6-2
+- Backport patch to fix appdata validation
+
+* Wed Apr 24 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.6-1
+- Release 5.6 stable
+
+* Sat Apr 13 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.6-0.1.rc1
+- Update to 5.6RC1
+- Added librsvg-2.0 to BuildRequires
+- Changed appdata filename
+
+* Sat Apr 06 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.5-4
+- Backport patch to fix Histogram Matching (RHBZ #1692572)
+
+* Tue Jan 01 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.5-1
 - Release 5.5 stable
 - Add libatomic to BRs to fix x64 builds
 

sources

@@ -1 +1 @@
-SHA512 (rawtherapee-5.5.tar.xz) = fcb546ad6e420200a821c89555ec259140995a3bc69429d2ecb648632c02e10ffceebbd7296e879c93b53ad8efa45ea71336d936cd90cead723e70e8932a413a
+SHA512 (rawtherapee-5.6.tar.xz) = 2c751c7631ea2ef65c334fa0baab16d4c3161fae66487870c476f07f1ea3604a5e28a251fd98d9688cafc088302af7aa6e28e9b27a37f916715708ed5e731f0f