[tuxtype2] Remove vendor tag from desktop file

paragn paragn at fedoraproject.org
Thu Feb 14 04:49:50 UTC 2013


commit efdba4a81087486af6d19eaa4efe4d820376544d
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Thu Feb 14 10:21:41 2013 +0530

    Remove vendor tag from desktop file
    
    - Cleanup spec as per recently changed packaging guidelines

 tuxtype2.spec |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/tuxtype2.spec b/tuxtype2.spec
index a8841b5..e2e00a5 100644
--- a/tuxtype2.spec
+++ b/tuxtype2.spec
@@ -1,6 +1,6 @@
 Name:           tuxtype2
 Version:        1.8.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        Tux Typing, an educational typing tutor for children
 Group:          Amusements/Games
@@ -8,7 +8,6 @@ License:        GPLv2+
 URL:            http://tux4kids.alioth.debian.org/tuxtype/index.php
 Source0:        https://alioth.debian.org/frs/download.php/3270/tuxtype_w_fonts-%{version}.tar.gz
 Patch0:         tuxtype2-1.8.1-chown.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel, SDL_Pango-devel
 BuildRequires:  SDL_ttf-devel, ImageMagick, desktop-file-utils
@@ -40,8 +39,7 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc
 rm -rf $RPM_BUILD_ROOT/%{_usr}/doc
@@ -64,18 +62,12 @@ EOF
 convert -size 48x48 tuxtype.ico $RPM_BUILD_ROOT/%{_datadir}/pixmaps/tuxtype.png
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \
                      --add-category X-Fedora \
-                     --vendor fedora \
                      %{name}.desktop
 
 %find_lang tuxtype
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f tuxtype.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO doc/en/howtotheme.html doc/en/TuxType_port_Mac.txt
 %attr(-,root,games) %{_bindir}/tuxtype
 %{_datadir}/pixmaps/*
@@ -86,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Feb 14 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.8.1-8
+- Remove vendor tag from desktop file
+- Cleanup spec as per recently changed packaging guidelines
+
 * Thu Aug 16 2012 Tom Callaway <spot at fedoraproject.org> - 1.8.1-7
 - fix chown patch
 


More information about the scm-commits mailing list