[wfut] Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077

paragn paragn at fedoraproject.org
Sat Feb 9 16:31:48 UTC 2013


commit b2483a3425a64a1a5d101711d84e8d5e1511d4ca
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Sat Feb 9 22:03:41 2013 +0530

    Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
    
    - Cleanup spec as per recently changed packaging guidelines

 wfut.spec |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/wfut.spec b/wfut.spec
index 0b0ee56..c7b6c1b 100644
--- a/wfut.spec
+++ b/wfut.spec
@@ -1,6 +1,6 @@
 Name:           wfut
 Version:        1.1.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Software updater tool for WorldForge applications
 
 Group:          Development/Libraries
@@ -9,7 +9,6 @@ URL:            http://www.worldforge.org
 Source0:        http://downloads.sourceforge.net/worldforge/WFUT-1.1.0.tar.gz
 Source1:        wfut.desktop
 Source2:        wfut.png
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-java desktop-file-utils
 
@@ -33,24 +32,20 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # The start script checks for a native binary, and if not found, will
 # try to use java + jar file instead.  But we are only building the
 # native binary, so don't bother with this check.
 mv $RPM_BUILD_ROOT%{_bindir}/wfut-bin $RPM_BUILD_ROOT%{_bindir}/wfut
 
-desktop-file-install --vendor fedora                            \
+desktop-file-install                            \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
         %{SOURCE1}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -65,7 +60,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/%{name}
 %{_datadir}/applications/*.desktop
@@ -73,6 +67,10 @@ fi
 
 
 %changelog
+* Sat Feb 09 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.1.0-13
+- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
+- Cleanup spec as per recently changed packaging guidelines
+
 * Sat Jan 26 2013 Bruno Wolff III <bruno at wolff.to> - 1.1.0-12
 - Rebuild for libgcc soname bump after harfbuzz was fixed
 


More information about the scm-commits mailing list