Use upstream appdata

inkscape.appdata.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-<!--
-BugReportURL: http://inkscape.13.x6.nabble.com/Inkscape-and-AppData-td4967842.html
-SentUpstream: 2013-09-06
--->
-<application>
-  <id type="desktop">inkscape.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <description>
-    <p>
-      An Open Source vector graphics editor, with capabilities similar to Illustrator,
-      CorelDraw, or Xara X, using the W3C standard Scalable Vector Graphics (SVG) file
-      format.
-    </p>
-    <p>
-      Inkscape supports many advanced SVG features (markers, clones, alpha blending,
-      etc.) and great care is taken in designing a streamlined interface. It is very
-      easy to edit nodes, perform complex path operations, trace bitmaps and much more.
-      We also aim to maintain a thriving user and developer community by using open,
-      community-oriented development.
-    </p>
-  </description>
-  <url type="homepage">http://inkscape.org/</url>
-  <screenshots>
-    <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/inkscape/a.png</screenshot>
-  </screenshots>
-  <!-- FIXME: change this to an upstream email address for spec updates
-  <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
-   -->
-</application>

inkscape.spec

@@ -2,7 +2,7 @@
 
 Name:           inkscape
 Version:        0.92.4
-Release:        11.git179c1e14%{?dist}
+Release:        12.git179c1e14%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 # Inkscape tags their releases with underscores and in ALLCAPS
@@ -12,9 +12,6 @@ License:        GPLv2+ and CC-BY
 URL:            https://inkscape.org/
 #Source0:        https://gitlab.com/inkscape/-/archive/%%{repotag}/%%{name}-%%{repotag}.tar.bz2
 Source0:        inkscape-master.tar.gz
-# AppData file. Upstream has merged a patch adding an appdata file
-# after into the 0.92 release branch.
-Source1:        %{name}.appdata.xml
 # Fedora Color Palette, GIMP format, CC-BY 3.0
 Source2:	Fedora-Color-Palette.gpl
 
@@ -160,10 +157,8 @@ desktop-file-install --vendor="%{?desktop_vendor}" --delete-original --remove-ke
 # No skencil anymore
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh
 
-# Install and validate appdata file
+# Validate appdata file
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
+appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appdata.xml
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata
-appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.appdata.xml
 
 # Install Fedora Color Pallette
 install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/inkscape/palettes/
@@ -199,7 +194,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/doc/inkscape/copyright
 %{_datadir}/inkscape/symbols
 %{_datadir}/inkscape/templates
 %{_datadir}/inkscape/ui
-%{_datadir}/appdata/*inkscape.appdata.xml
 %{_datadir}/metainfo/org.inkscape.Inkscape.appdata.xml
 %{_datadir}/applications/org.inkscape.Inkscape.desktop
 %{_mandir}/man1/*.1*
@@ -222,6 +216,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/doc/inkscape/copyright
 
 
 %changelog
+* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 0.92.4-12.git179c1e14
+- Use upstream appdata
+
 * Fri Aug 30 2019 Miro Hrončok <mhroncok@redhat.com> - 0.92.4-11.git179c1e14
 - Explicitly depend on Python 3 interpreter
 - Use python3 explicitly when building