From 628c0bb5c223a2444058aa8557eb0c7e8d21484e Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Fri, 18 Sep 2015 11:19:04 +0100
Subject: [PATCH] Remove AppStream metadata file as it's no longer used

---
 torque.spec | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/torque.spec b/torque.spec
index 6d418be..7df0cd4 100644
--- a/torque.spec
+++ b/torque.spec
@@ -71,7 +71,7 @@
 
 Name:        torque
 Version:     4.2.10
-Release:     6%{?dist}
+Release:     7%{?dist}
 Summary:     Tera-scale Open-source Resource and QUEue manager
 Source0:     http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz
 Source2:     xpbs.desktop
@@ -500,22 +500,6 @@ rm %{buildroot}%{_mandir}/man1/basl2c.1
 # fix permissions for some directories in /var/lib/torque
 chmod 755 `find %{buildroot}/var/lib/torque -type d`
 
-# Merge applications into one software center item
-%if %{build_gui}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/xpbsmon.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-<component type="desktop">
-  <metadata_license>CC0-1.0</metadata_license>
-  <id>xpbsmon.desktop</id>
-  <metadata>
-    <value key="X-Merge-With-Parent">xpbs.desktop</value>
-  </metadata>
-</component>
-EOF
-%endif
-
 %clean
 rm -rf %{buildroot}
 
@@ -740,7 +724,6 @@ fi
 %{_bindir}/xpbsmon
 %{_libdir}/xpbs
 %{_libdir}/xpbsmon
-%{_datadir}/appdata/*.appdata.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
 %{_mandir}/man1/xpbs.1.*
@@ -892,6 +875,9 @@ fi
 %endif
 
 %changelog
+* Fri Sep 18 2015 Richard Hughes <rhughes@redhat.com> - 4.2.10-7
+- Remove AppStream metadata file as it's no longer used.
+
 * Mon Aug 17 2015 Fedora Release Engineering <david.brown@pnnl.gov> - 4.2.10-6
 - enable numa support bug #1231148