rpms/xffm/devel xffm-4.2.0-menu.patch,NONE,1.1 xffm.spec,1.1,1.2

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/xffm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16527

Modified Files:
	xffm.spec 
Added Files:
	xffm-4.2.0-menu.patch 
Log Message:
Resynced with 4.2.0 spec file from core cvs. 
Readded patches. 


xffm-4.2.0-menu.patch:

--- NEW FILE xffm-4.2.0-menu.patch ---
--- xffm-4.2.0/src/Xffstab.desktop.orig	2005-02-21 12:09:22.065891551 +0100
+++ xffm-4.2.0/src/Xffstab.desktop	2005-02-21 12:09:37.992253979 +0100
@@ -15,3 +15,4 @@
 Categories=X-XFCE;Core;Filemanager;Utility;System
 GenericName=Fstab mount manager
 GenericName[ko]=Fstab 마운트 관리자
+OnlyShowIn=XFCE;
--- xffm-4.2.0/src/Xftree.desktop.orig	2005-02-21 12:08:46.142840482 +0100
+++ xffm-4.2.0/src/Xftree.desktop	2005-02-21 12:09:04.912732203 +0100
@@ -117,3 +117,4 @@
 Terminal=false
 Type=Application
 Categories=Applications;X-XFCE;Core
+OnlyShowIn=XFCE;
--- xffm-4.2.0/src/Xfdiff.desktop.orig	2005-02-21 12:10:00.011607212 +0100
+++ xffm-4.2.0/src/Xfdiff.desktop	2005-02-21 12:10:17.853652159 +0100
@@ -11,3 +11,4 @@
 Terminal=false
 Type=Application
 Categories=X-XFCE;Core;Utility
+OnlyShowIn=XFCE;


Index: xffm.spec
===================================================================
RCS file: /cvs/extras/rpms/xffm/devel/xffm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xffm.spec	19 Mar 2005 18:32:11 -0000	1.1
+++ xffm.spec	20 Mar 2005 20:45:39 -0000	1.2
@@ -5,33 +5,38 @@
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.1/src-bz2/xffm-4.2.1.tar.bz2
-Patch1: xffm-4.0.5-rpath.patch
+
+Patch: xffm-4.2.0-rpath.patch
+Patch1: xffm-4.2.0-menu.patch
+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Prereq: /sbin/ldconfig
+
 Requires: dbh >= 1.0
 Requires: glib2 >= 2.0.0
 Requires: gtk2 >= 2.0.0
-Requires: libxfce4mcs >= 4.0.5
-Requires: libxfce4util >= 4.0.5
-Requires: libxfcegui4 >= 4.0.5
+Requires: libxfce4mcs >= %{version}
+Requires: libxfce4util >= %{version}
+Requires: libxfcegui4 >= %{version}
 Requires: libxml2 >= 2.4.0
+
 BuildRequires: dbh-devel >= 1.0
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: gtk2-devel >= 2.0.0
-BuildRequires: libxfce4mcs-devel >= 4.0.5
-BuildRequires: libxfce4util-devel >= 4.0.5
-BuildRequires: libxfcegui4-devel >= 4.0.5
+BuildRequires: libxfce4mcs-devel >= %{version}
+BuildRequires: libxfce4util-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: libxml2-devel >= 2.4.0
-BuildRequires: xfce-mcs-manager-devel >= 4.0.5
+BuildRequires: xfce-mcs-manager-devel >= %{version}
 
 %description
 This package includes a filemanager and SMB network navigator for Xfce4.
 
 %prep
 %setup -q
-
-%patch1 -p1 -b .rpath
+%patch -p1 -b .rpath
+%patch1 -p1 -b .menu
 
 %build
 %configure
@@ -56,26 +61,25 @@
 %doc README TODO ChangeLog NEWS COPYING AUTHORS
 %{_bindir}/*
 %{_libdir}/lib*
-%{_libdir}/xfce4/xffm/*
 %{_libdir}/pkgconfig/*
 %{_libdir}/xfce4/mcs-plugins/*
+%{_libdir}/xfce4/xffm/*
 %{_datadir}/xffm
 %{_datadir}/xfce4/*
-%{_datadir}/applications/*.desktop
-%{_datadir}/icons/*
+%{_datadir}/applications/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man?/*
 
 %changelog
-* Tue Mar 15 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
-- Updated to 4.2.1 version
-
-* Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
+* Sun Mar 20 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.1-1
 - Fixed case of Xfce
-- Fixed Source0 line. 
-- Removed generic INSTALL from %doc
-- Inital Fedora Extras version
+- Fixed Source0 line
+- Reimported 4.2.0 spec from core cvs
+
+* Mon Feb 21 2005 Than Ngo <than at redhat.com> 4.2.0-2
+- cleanup menu
 
-* Tue Jul 20 2004 Than Ngo <than at redhat.com> 4.0.6-1
+* Fri Jan 28 2005 Than Ngo <than at redhat.com> 4.2.0-1 
 - update to 4.0.6
 
 * Thu Jun 17 2004 Than Ngo <than at redhat.com> 4.0.5-4