[xgalaxy] Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
paragn
paragn at fedoraproject.org
Sun Feb 10 06:03:06 UTC 2013
commit 8a7147379dbcab26352623fe0571d5cc631b8bc8
Author: Parag Nemade <paragn at fedoraproject.org>
Date: Sun Feb 10 11:34:51 2013 +0530
Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
- Cleanup spec as per recently changed packaging guidelines
xgalaxy.spec | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/xgalaxy.spec b/xgalaxy.spec
index a4b1382..c969c7a 100644
--- a/xgalaxy.spec
+++ b/xgalaxy.spec
@@ -1,6 +1,6 @@
Name: xgalaxy
Version: 2.0.34
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Arcade game: shoot down the space ships attacking the planet
Group: Amusements/Games
License: GPL+
@@ -15,7 +15,6 @@ Patch3: %{name}-2.0.34-joy.patch
Patch4: %{name}-2.0.34-fullscreen-viewport.patch
Patch5: %{name}-2.0.34-alsa.patch
Patch6: %{name}-2.0.34-dga-compile-fix.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXt-devel libXpm-devel libXmu-devel libXxf86vm-devel
BuildRequires: alsa-lib-devel desktop-file-utils ImageMagick
Requires: hicolor-icon-theme
@@ -62,8 +61,7 @@ convert images/player3.xpm %{name}.png
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
# move the sound-server binary out of %{_datadir}
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/xgal.sndsrv.alsa \
$RPM_BUILD_ROOT%{_bindir}
@@ -73,14 +71,14 @@ ln -s ../../bin/xgal.sndsrv.alsa \
chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/*/*
# make install doesn't install the manpage
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
-install -m 644 xgal.6x $RPM_BUILD_ROOT%{_mandir}/man6/%{name}.6
+install -p -m 644 xgal.6x $RPM_BUILD_ROOT%{_mandir}/man6/%{name}.6
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
-desktop-file-install --vendor fedora \
+desktop-file-install \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE2}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps
@@ -88,10 +86,6 @@ install -p -m 644 %{name}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -106,17 +100,20 @@ fi
%files
-%defattr(-,root,root,-)
%doc CHANGES COPYING README README.fedora
%{_bindir}/%{name}*
%{_bindir}/xgal.sndsrv.alsa
%{_datadir}/%{name}
%{_mandir}/man6/%{name}.6.gz
-%{_datadir}/applications/fedora-%{name}*.desktop
+%{_datadir}/applications/%{name}*.desktop
%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
%changelog
+* Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 2.0.34-18
+- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
+- Cleanup spec as per recently changed packaging guidelines
+
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.34-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list