SPECS (DEVEL): xfdesktop.spec - vfmg is not required anymore, adde...

[freetz]

Author: freetz                       Date: Wed May 10 20:59:53 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- vfmg is not required anymore, added Thunar support, updated BR

---- Files affected:
SPECS:
   xfdesktop.spec (1.61.2.1 -> 1.61.2.2) 

---- Diffs:

================================================================
Index: SPECS/xfdesktop.spec
diff -u SPECS/xfdesktop.spec:1.61.2.1 SPECS/xfdesktop.spec:1.61.2.2
--- SPECS/xfdesktop.spec:1.61.2.1	Wed Apr 26 21:20:25 2006
+++ SPECS/xfdesktop.spec	Wed May 10 22:59:48 2006
@@ -1,37 +1,30 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_without	vfmg	# use autogenerated Xfce menu instead of vfmg
-#
 Summary:	Desktop manager for the Xfce Desktop Environment
 Summary(pl):	Zarządca pulpitu dla środowiska Xfce
 Name:		xfdesktop
 Version:	4.3.90.1
-Release:	1%{!?with_vfmg:novfmg}
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	2d01a1e8542710605e681d5a8db31bcf
 Patch0:		%{name}-locale-names.patch
-Patch1:		%{name}-vfmg.patch
 URL:		http://www.xfce.org/
+BuildRequires:	Thunar-devel >= 0.3.0
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 1:2.6.0
+BuildRequires:	gtk+2-devel >= 2:2.6.0
 BuildRequires:	intltool
+BuildRequires:	libexo-devel >= 0.3.1.6
 BuildRequires:	libtool
 BuildRequires:	libxfce4mcs-devel >= %{version}
 BuildRequires:	libxfcegui4-devel >= %{version}
 BuildRequires:	libxml2-devel >= 2.4.0
 BuildRequires:	pkgconfig >= 1:0.9.0
-BuildRequires:	xfce-mcs-manager-devel >= %{version}
 BuildRequires:	xfce4-dev-tools
 BuildRequires:	xfce4-panel-devel >= %{version}
-%if %{with vfmg}
-Requires(post):	vfmg >= 0.9.95
-Requires:	vfmg >= 0.9.18-8
-%endif
+BuildRequires:	xfce-mcs-manager-devel >= %{version}
 Requires:	libxfce4mcs >= %{version}
 Requires:	libxfcegui4 >= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -45,14 +38,13 @@
 %prep
 %setup -q
 %patch0 -p1
-%{?with_vfmg:%patch1 -p1}
 
 mv -f po/{pt_PT,pt}.po
 mv -f po/{nb_NO,nb}.po
 
 %build
-glib-gettextize --copy --force
-intltoolize --copy --force
+%{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros
 %{__autoheader}
@@ -68,7 +60,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{?with_vfmg:touch $RPM_BUILD_ROOT%{_sysconfdir}/xdg/xfce4/desktop/menu2.xml}
 rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/{mcs-plugins,panel-plugins,modules}/*.{la,a}
 
 %find_lang %{name}
@@ -76,14 +67,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with vfmg}
-%post
-# generate initial menu
-[ -f /etc/sysconfig/vfmg ] && . /etc/sysconfig/vfmg
-[ "$XFCE4" = yes -o "$XFCE4" = 1 -o ! %{_sysconfdir}/xdg/xfce4/desktop/menu2.xml ] && \
-	vfmg xfce4 > %{_sysconfdir}/xdg/xfce4/desktop/menu2.xml 2>/dev/null ||:
-%endif
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
@@ -155,6 +138,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61.2.2  2006/05/10 20:59:48  freetz
+- vfmg is not required anymore, added Thunar support, updated BR
+
 Revision 1.61.2.1  2006/04/26 19:20:25  troll
 - updated to 4.3.90.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xfdesktop.spec?r1=1.61.2.1&r2=1.61.2.2&f=u