rpms/torque
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into el6

Browse Source 
Conflicts:
	torque.spec
This commit is contained in:
David Brown 2015-04-02 09:52:30 -07:00
commit 435bcf6c6c
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
torque.spec
View File

@ -474,6 +474,22 @@ rm %{buildroot}%{_mandir}/man1/basl2c.1
# fix permissions for some directories in /var/lib/torque # fix permissions for some directories in /var/lib/torque
chmod 755 `find %{buildroot}/var/lib/torque -type d` 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 %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -654,6 +670,7 @@ fi
%{_bindir}/xpbsmon %{_bindir}/xpbsmon
%{_libdir}/xpbs %{_libdir}/xpbs
%{_libdir}/xpbsmon %{_libdir}/xpbsmon
%{_datadir}/appdata/*.appdata.xml
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.png %{_datadir}/pixmaps/*.png
%{_mandir}/man1/xpbs.1.* %{_mandir}/man1/xpbs.1.*
@ -796,6 +813,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Mar 26 2015 Richard Hughes <rhughes@redhat.com> - 4.2.8-2
- Add an AppData file for the software center
* Tue Oct 14 2014 David Brown <david.brown@pnnl.gov> - 4.2.8-2 * Tue Oct 14 2014 David Brown <david.brown@pnnl.gov> - 4.2.8-2
- merged fedora latest into epel - merged fedora latest into epel
- This breaks old configs and should be treated carefully - This breaks old configs and should be treated carefully