mschwendt pushed to geeqie (master). "Merge Fedora appdata file as requested on devel@ list. (..more)"

[notifications at fedoraproject.org]

>From b23a1bc04a0b12e6411dcf2430bae0e093d6bc46 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Wed, 25 Mar 2015 22:23:55 +0100
Subject: Merge Fedora appdata file as requested on devel@ list.

- Use %license macro.

diff --git a/geeqie.appdata.xml b/geeqie.appdata.xml
new file mode 100644
index 0000000..5b159b8
--- /dev/null
+++ b/geeqie.appdata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Ryan Lerch <rlerch at redhat.com> -->
+
+<!-- HOUSEKEEPING, REMOVE THIS COMMENT WHEN THIS GOES UPSTREAM
+BugReportURL: https://sourceforge.net/p/geeqie/support-requests/8/
+SentUpstream: 2014-09-17
+-->
+
+<application>
+  <id type="desktop">geeqie.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <description>
+  <p>
+    Geeqie is an application for browsing images -- you open up an image or directory to browse
+    and view all the images in that directory. It also displays all the relevant data and metadata
+    for your images in various, configurable sidebar widgets. It can display many forms of data,
+    including exif metadata, color histograms, GPS locations of the photo.
+  </p>
+  </description>
+  <url type="homepage">http://geeqie.sourceforge.net/</url>
+  <screenshots>
+    <screenshot type="default">http://sourceforge.net/p/geeqie/screenshot/233062.jpg</screenshot>
+    <screenshot>http://sourceforge.net/p/geeqie/screenshot/235493.jpg</screenshot>
+  </screenshots>
+</application>
diff --git a/geeqie.spec b/geeqie.spec
index 28f0652..763343d 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -6,7 +6,7 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.2
-Release: 0.1.20141130gita1afabd%{?dist}
+Release: 0.2.20141130gita1afabd%{?dist}
 License: GPLv2+
 Group: User Interface/X
 #Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
@@ -18,6 +18,11 @@ Group: User Interface/X
 Source: geeqie-a1afabd.tar.bz2
 BuildRequires: autoconf automake libtool
 
+# https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appdata-extra/desktop/geeqie.appdata.xml
+Source1: geeqie.appdata.xml
+# for /usr/bin/appstream-util
+BuildRequires: libappstream-glib
+
 URL: http://geeqie.sourceforge.net/
 
 # add -Wl,--as-needed without disturbing %%configure macro
@@ -111,6 +116,9 @@ desktop-file-install \
 
 %find_lang %name
 
+install -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/appdata/%{name}.appdata.xml
+appstream-util validate-relax --nonet ${RPM_BUILD_ROOT}%{_datadir}/appdata/%{name}.appdata.xml
+
 
 %post
 update-desktop-database &> /dev/null || :
@@ -122,15 +130,21 @@ update-desktop-database &> /dev/null || :
 
 %files -f %{name}.lang
 %doc %{_pkgdocdir}/
+%license COPYING
 %{_bindir}/%{name}*
 %{_prefix}/lib/%{name}/
 %{_mandir}/man1/%{name}.1*
 %{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*%{name}.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
 
 
 %changelog
+* Wed Mar 25 2015 Michael Schwendt <mschwendt at fedoraproject.org> - 1.2-0.2.20141130gita1afabd
+- Merge Fedora appdata file as requested on devel@ list.
+- Use %%license macro.
+
 * Sun Nov 30 2014 Michael Schwendt <mschwendt at fedoraproject.org> - 1.2-0.1.20141130gita1afabd
 - TODO: Lua support wants lua5.1.pc >= 5.1, which isn't available
   (only lua.pc 5.2.x exists).
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/geeqie.git/commit/?h=master&id=b23a1bc04a0b12e6411dcf2430bae0e093d6bc46