[xfce-utils] Some cleanups before build

Christoph Wickert cwickert at fedoraproject.org
Sat Jan 8 22:37:40 UTC 2011


commit 11e5696ad634795d5f73f6f6da978c56dabf6a8b
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Jan 8 23:37:27 2011 +0100

    Some cleanups before build

 xfce-utils.spec |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/xfce-utils.spec b/xfce-utils.spec
index 3b5fadf..ed53fae 100644
--- a/xfce-utils.spec
+++ b/xfce-utils.spec
@@ -10,8 +10,6 @@ Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://www.xfce.org/
 Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-# FIXME: do we need to ship our own file?
-#Source1:        xfce4.desktop
 Patch0:         xfce-utils-4.7.3-pulseaudio.patch
 Patch1:         xfce-utils-4.4.3-xfterm4-bug.patch
 # modfied version of http://bugzilla.xfce.org/show_bug.cgi?id=3770
@@ -38,7 +36,6 @@ This package includes utilities for the Xfce Desktop Environment.
 Summary:        Basic documentation for the Xfce Desktop Environment
 Group:          Documentation
 BuildArch:      noarch
-#Requires: %{name} = %{version}-%{release}
 
 %description -n xfce4-doc
 This package includes common docs for the Xfce Desktop Environment.
@@ -61,9 +58,6 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 %find_lang %{name}
-# FIXME: do we need to ship our own file?
-#rm -f $RPM_BUILD_ROOT%{xsessiondir}/xfce.desktop
-#install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/
 
 desktop-file-install --vendor="" --delete-original \
 	--add-category="Documentation" \
@@ -79,7 +73,6 @@ desktop-file-install --vendor="" --delete-original \
 
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/xfrun4.desktop
 
-# FIXME: does not validate, see http://bugzilla.xfce.org/show_bug.cgi?id=6913
 desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop
     
 # we need the doc package to own these 


More information about the scm-commits mailing list