dmlb2000 pushed to torque (el5). "Merge branch 'master' into el6 (..more)"

[notifications at fedoraproject.org]

>From 6232a919bdd59b39e14092336b50a9925b1c3d3c Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Thu, 26 Mar 2015 16:47:00 +0000
Subject: Add an AppData file for the software center


diff --git a/torque.spec b/torque.spec
index fde49f6..d7e07c5 100644
--- a/torque.spec
+++ b/torque.spec
@@ -71,7 +71,7 @@
 
 Name:        torque
 Version:     4.2.8
-Release:     1%{?dist}
+Release:     2%{?dist}
 Summary:     Tera-scale Open-source Resource and QUEue manager
 Source0:     http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz
 Source2:     xpbs.desktop
@@ -514,6 +514,22 @@ fi
         --slave %{_mandir}/man1/qstat.1.gz qstat-man \
                 %{_mandir}/man1/qstat-torque.1.gz
 
+# 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 at 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
+
 %preun client
 if [ $1 -eq 0 ]; then
   /usr/sbin/alternatives --remove qsub %{_bindir}/qsub-torque
@@ -651,6 +667,7 @@ fi
 %{_bindir}/xpbsmon
 %{_libdir}/xpbs
 %{_libdir}/xpbsmon
+%{_datadir}/appdata/*.appdata.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
 %{_mandir}/man1/xpbs.1.*
@@ -791,6 +808,9 @@ fi
 %endif
 
 %changelog
+* Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 4.2.8-2
+- Add an AppData file for the software center
+
 * Mon Sep 01 2014 Haïkel Guémar <hguemar at fedoraproject.org> - 4.2.8-1
 - upstream 4.2.8
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/torque.git/commit/?h=el5&id=435bcf6c6ca03b18b457621ad5d15863f46b4724