SPECS (AC-branch): xfdesktop.spec - updated to 4.4.0, merged from ...

megabajt megabajt at pld-linux.org
Mon Jan 29 10:39:04 CET 2007 

Author: megabajt                     Date: Mon Jan 29 09:39:04 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- updated to 4.4.0, merged from HEAD

---- Files affected:
SPECS:
   xfdesktop.spec (1.56.2.1 -> 1.56.2.2) 

---- Diffs:

================================================================
Index: SPECS/xfdesktop.spec
diff -u SPECS/xfdesktop.spec:1.56.2.1 SPECS/xfdesktop.spec:1.56.2.2
--- SPECS/xfdesktop.spec:1.56.2.1	Wed Jul  5 13:23:38 2006
+++ SPECS/xfdesktop.spec	Mon Jan 29 10:38:57 2007
@@ -1,36 +1,34 @@
 # $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.2.3
-Release:	1%{!?with_vfmg:novfmg}
+Version:	4.4.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5:	0be57a574a654625d61281411fb6be55
+Source0:	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	a1c93d228924b5daf151f698114021d3
 Patch0:		%{name}-locale-names.patch
-Patch1:		%{name}-vfmg.patch
 URL:		http://www.xfce.org/
+BuildRequires:	Thunar-devel >= 0.8.0
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 1:2.2.0
-BuildRequires:	intltool
+BuildRequires:	gtk+2-devel >= 2:2.8.20
+BuildRequires:	intltool >= 0.35.0
+BuildRequires:	libexo-devel >= 0.3.2
 BuildRequires:	libtool
 BuildRequires:	libxfce4mcs-devel >= %{version}
 BuildRequires:	libxfcegui4-devel >= %{version}
-BuildRequires:	libxml2-devel >= 2.4.0
+BuildRequires:	libxml2-devel >= 1:2.6.27
 BuildRequires:	pkgconfig >= 1:0.9.0
+BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	xfce-mcs-manager-devel >= %{version}
-BuildRequires:	xfce4-dev-tools
+BuildRequires:	xfce4-dev-tools >= %{version}
 BuildRequires:	xfce4-panel-devel >= %{version}
-%{?with_vfmg:Requires:	vfmg >= 0.9.18-8}
-Requires:	libxfce4mcs >= %{version}
-Requires:	libxfcegui4 >= %{version}
+Requires(post,postun):	gtk+2
+Requires(post,postun):	hicolor-icon-theme
+Requires:	xdg-menus
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,20 +40,26 @@
 %prep
 %setup -q
 %patch0 -p1
-%{?with_vfmg:%patch1 -p1}
 
 mv -f po/{pt_PT,pt}.po
 mv -f po/{nb_NO,nb}.po
 
 %build
-%{__intltoolize}
 %{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
-%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros
+%{__aclocal}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
-%configure
+%configure \
+	--enable-desktop-icons \
+	--enable-desktop-menu \
+	--enable-exo \
+	--enable-file-icons \
+	--enable-panel-plugin \
+	--enable-menueditor \
+	--enable-thunarx
 
 %{__make}
 
@@ -65,7 +69,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}
@@ -73,13 +76,11 @@
 %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 -f -x -c -u -m xfce4 > %{_sysconfdir}/xdg/xfce4/desktop/menu2.xml 2>/dev/null ||:
-%endif
+%update_icon_cache hicolor
+
+%postun
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -87,16 +88,16 @@
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/xfce4/mcs-plugins/*.so
 %attr(755,root,root) %{_libdir}/xfce4/modules/*.so
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/*.so
+%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-menu-plugin
+%dir %{_datadir}/xfce4-menueditor
+%{_datadir}/xfce4-menueditor/xfce4-menueditor.ui
 %docdir %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/doc/C/*
 %lang(fr) %{_datadir}/xfce4/doc/fr/*
-%lang(he) %{_datadir}/xfce4/doc/he/*
 %{_mandir}/man1/*.1*
 
 %dir %{_sysconfdir}/xdg/xfce4/desktop
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml
-%{?with_vfmg:%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu2.xml}
 %lang(ca) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.ca
 %lang(cs) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.cs
 %lang(da) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.da
@@ -104,6 +105,7 @@
 %lang(el) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.el
 %lang(es) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.es
 %lang(et) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.et
+%lang(eu) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.eu
 %lang(fi) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.fi
 %lang(fr) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.fr
 %lang(he) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.he
@@ -122,9 +124,14 @@
 %lang(zh_TW) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.zh_TW
 
 %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml
+%lang(ca) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.ca
 %lang(cs) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.cs
+%lang(de) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.de
+%lang(el) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.el
+%lang(es) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.es
 %lang(eu) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.eu
 %lang(fi) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.fi
+%lang(fr) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.fr
 %lang(he) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.he
 %lang(hu) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.hu
 %lang(ja) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.ja
@@ -139,6 +146,7 @@
 %lang(zh_TW) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_TW
 %{_desktopdir}/*.desktop
 %{_datadir}/xfce4/backdrops
+%{_datadir}/xfce4/panel-plugins/*
 %{_pixmapsdir}/*
 %{_iconsdir}/hicolor/*/apps/*
 
@@ -148,12 +156,51 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56.2.2  2007/01/29 09:38:57  megabajt
+- updated to 4.4.0, merged from HEAD
+
+Revision 1.67  2007/01/22 18:04:51  megabajt
+- updated to 4.4.0
+
+Revision 1.66  2006/11/06 21:20:42  megabajt
+- up to 4.3.99.2 (Xfce 4.4RC2)
+- updated deps
+
+Revision 1.65  2006/09/05 19:20:51  megabajt
+- md5
+
+Revision 1.64  2006/09/05 19:17:36  megabajt
+- up to 4.3.99.1
+- use rpm macros
+
+Revision 1.63  2006/07/16 20:46:19  freetz
+- oops, cuto/pasto
+
+Revision 1.62  2006/07/16 18:34:24  freetz
+- merged from DEVEL
+
+Revision 1.61.2.4  2006/07/16 18:33:52  freetz
+- 4.3.90.2, updated deps and file list, --as-needed support, update icon
+  cache
+
+Revision 1.61.2.3  2006/05/10 21:25:42  freetz
+- require freedesktop compliant menu infrastructure
+
+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
+
 Revision 1.56.2.1  2006/07/05 11:23:38  havner
 - 4.2.3, HEAD merge but vfmg commit
 - intltoolize before glib_gettextize
 
 Revision 1.61  2006/04/20 09:32:14  ankry
 - tab
+
+Revision 1.60  2006/04/18 20:38:34  sparky
+- prepared for new vfmg
 
 Revision 1.59  2005/11/10 06:58:20  charles
 - updated to 4.2.3
================================================================

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

More information about the pld-cvs-commit mailing list