kvolny pushed to vodovod (epel7). "Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Apr 13 08:09:45 UTC 2015


>From 5a7824069f17a83ad145c34859c2e1a54de1d9f6 Mon Sep 17 00:00:00 2001
From: Parag Nemade <paragn at fedoraproject.org>
Date: Sat, 9 Feb 2013 21:57:21 +0530
Subject: Remove vendor tag from desktop file as per
 https://fedorahosted.org/fesco/ticket/1077

- Cleanup spec as per recently changed packaging guidelines

diff --git a/vodovod.spec b/vodovod.spec
index 05849b6..4559f24 100644
--- a/vodovod.spec
+++ b/vodovod.spec
@@ -1,6 +1,6 @@
 Name:		vodovod
 Version:	1.10r19
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	A pipe connecting game
 
 Group:		Amusements/Games
@@ -8,7 +8,6 @@ License:	GPLv2+
 URL:		http://home.gna.org/vodovod/
 #Source:	http://download.gna.org/vodovod/%{name}-%{version}-src.tar.gz
 Source:		%{name}-%{version}-src.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils SDL-devel SDL_image-devel SDL_mixer-devel
 BuildRequires:	SDL_ttf-devel gettext ImageMagick
@@ -57,7 +56,6 @@ EOF
 
 
 %install
-rm -rf %{buildroot}
 make PREFIX=%{_prefix} DESTDIR=%{buildroot} install
 # since the game sources do not come with the hiscore file, we have to create it
 # this will result in empty hiscore table, but it is not such a big deal
@@ -66,15 +64,11 @@ touch %{buildroot}%{_localstatedir}/games/%{name}.sco
 # add icon and .desktop file
 mkdir -p -m 0755 %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
 convert data/abicon.bmp %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/vodovod.xpm
-desktop-file-install --vendor="fedora" \
+desktop-file-install  \
 	--dir=%{buildroot}%{_datadir}/applications %{name}.desktop
 %find_lang %{name}
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -90,16 +84,19 @@ fi
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc CHANGES COPYING html
 %attr(2755,root,games) %{_bindir}/%{name}
 %{_datadir}/%{name}/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
 %config(noreplace) %attr (0664,root,games) %{_localstatedir}/games/%{name}.sco
 
 
 %changelog
+* Sat Feb 09 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.10r19-11
+- 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> - 1.10r19-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/vodovod.git/commit/?h=epel7&id=5a7824069f17a83ad145c34859c2e1a54de1d9f6


More information about the scm-commits mailing list