mattdm pushed to rawtherapee (f22). "fix appstream validation (thanks, kalev)"

[notifications at fedoraproject.org]

>From 9a2ce61d126bbc95b1a161f5349f9584462962fa Mon Sep 17 00:00:00 2001
From: Matthew Miller <mattdm at mattdm.org>
Date: Tue, 24 Mar 2015 19:12:16 -0400
Subject: fix appstream validation (thanks, kalev)


diff --git a/rawtherapee-4.2-appstreamtweak.patch b/rawtherapee-4.2-appstreamtweak.patch
new file mode 100644
index 0000000..2aba853
--- /dev/null
+++ b/rawtherapee-4.2-appstreamtweak.patch
@@ -0,0 +1,41 @@
+--- rawtherapee-4.2/rawtherapee.appdata.xml.orig	2015-03-24 23:52:09.711700608 +0100
++++ rawtherapee-4.2/rawtherapee.appdata.xml	2015-03-24 23:55:02.381715497 +0100
+@@ -13,20 +13,24 @@
+     <p>
+       All aspects of RawTherapee are documented in the RawPedia wiki. There is also an active forum and IRC channel for interaction with the developers and other users.
+     </p>
+-    Supported input formats:
+-    <ul>
+-      <li>Most raw formats including those from Bayer and X-Trans type sensors</li>
+-      <li>HDR DNG 1.4 with floating-point data</li>
+-      <li>8-bit, 16-bit and 32-bit TIFF (RGB)</li>
+-      <li>8-bit and 16-bit PNG (RGB)</li>
+-      <li>JPEG</li>
+-    </ul>
+-    Supported output formats:
+-    <ul>
+-      <li>JPEG</li>
+-      <li>8-bit and 16-bit TIFF</li>
+-      <li>8-bit and 16-bit PNG</li>
+-    </ul>
++    <p>
++      Supported input formats:
++      <ul>
++        <li>Most raw formats including those from Bayer and X-Trans type sensors</li>
++        <li>HDR DNG 1.4 with floating-point data</li>
++        <li>8-bit, 16-bit and 32-bit TIFF (RGB)</li>
++        <li>8-bit and 16-bit PNG (RGB)</li>
++        <li>JPEG</li>
++      </ul>
++    </p>
++    <p>
++      Supported output formats:
++      <ul>
++        <li>JPEG</li>
++        <li>8-bit and 16-bit TIFF</li>
++        <li>8-bit and 16-bit PNG</li>
++      </ul>
++    </p>
+   </description>
+   <screenshots>
+     <screenshot type="default">http://rawtherapee.com/images/screenshots/rt-42_07-hdr-landscape.jpg</screenshot>
diff --git a/rawtherapee.spec b/rawtherapee.spec
index fb3b34c..75e8fa1 100644
--- a/rawtherapee.spec
+++ b/rawtherapee.spec
@@ -1,6 +1,6 @@
 Name:           rawtherapee
 Version:        4.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Raw image processing software
 
 Group:          Applications/Multimedia 
@@ -19,6 +19,8 @@ Requires:       hicolor-icon-theme fftw
 
 Obsoletes:      rawtherapee-doc < %{version}-%{release}
 
+Patch:          rawtherapee-4.2-appstreamtweak.patch
+
 %description
 Rawtherapee is a RAW image processing software. It gives full control over
 many parameters to enhance the raw picture before finally exporting it
@@ -26,6 +28,7 @@ to some common image format.
 
 %prep
 %setup -q
+%patch -p1 -b .htmlfix
 
 # fix wrong line endings
 sed -i "s|\r||g" LICENSE.txt
@@ -55,8 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT 
 
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
-# FIX: there's a parse error in F22 and F23 but not F21
-#appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/appdata/%{name}.appdata.xml
+appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/appdata/%{name}.appdata.xml
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
@@ -98,6 +100,10 @@ fi || :
 
 
 %changelog
+* Tue Mar 24 2015 Matthew Miller <mattdm at fedoraproject.org> - 4.2-6
+- ooh, fixed it. (insufficiently strict html in description. will
+  submit bug upstream -- thanks Kalev for the fix!)
+
 * Tue Mar 24 2015 Matthew Miller <mattdm at fedoraproject.org> - 4.2-5
 - appstream validation currently failing on f22 and f23. temporarily
   disabling
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/rawtherapee.git/commit/?h=f22&id=9a2ce61d126bbc95b1a161f5349f9584462962fa

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390