SPECS: xfdesktop.spec - updated to 4.6.0 - removed obsolete -locale-names.p...

megabajt megabajt at pld-linux.org
Sat Feb 28 15:25:03 CET 2009


Author: megabajt                     Date: Sat Feb 28 14:25:03 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 4.6.0
- removed obsolete -locale-names.patch, -desktop.patch and -ac_fix.patch

---- Files affected:
SPECS:
   xfdesktop.spec (1.76 -> 1.77) 

---- Diffs:

================================================================
Index: SPECS/xfdesktop.spec
diff -u SPECS/xfdesktop.spec:1.76 SPECS/xfdesktop.spec:1.77
--- SPECS/xfdesktop.spec:1.76	Tue Oct 28 13:02:22 2008
+++ SPECS/xfdesktop.spec	Sat Feb 28 15:24:57 2009
@@ -2,35 +2,33 @@
 Summary:	Desktop manager for the Xfce Desktop Environment
 Summary(pl.UTF-8):	Zarządca pulpitu dla środowiska Xfce
 Name:		xfdesktop
-Version:	4.4.3
+Version:	4.6.0
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	3c1ea8d2ccb3cfbbbbba834214ad5d2e
-Patch0:		%{name}-locale-names.patch
-Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-ac_fix.patch
-URL:		http://www.xfce.org/
-BuildRequires:	Thunar-devel >= 0.9.3
+# Source0-md5:	508b18f9d4ef27833517bba3bd6e2fbf
+URL:		http://www.xfce.org/projects/xfdesktop/
+BuildRequires:	Thunar-devel >= 1.0.0
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	exo-devel >= 0.3.100
 BuildRequires:	gettext-devel
 BuildRequires:	gtk+2-devel >= 2:2.10.6
 BuildRequires:	intltool >= 0.35.0
-BuildRequires:	libexo-devel >= 0.3.4
+BuildRequires:	libglade2-devel
 BuildRequires:	libtool
-BuildRequires:	libxfce4mcs-devel >= %{version}
+BuildRequires:	libwnck-devel >= 2.12.0
+BuildRequires:	libxfce4menu-devel >= %{version}
 BuildRequires:	libxfcegui4-devel >= %{version}
-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 >= 4.4.0.1
+BuildRequires:	xfce4-dev-tools >= 4.6.0
 BuildRequires:	xfce4-panel-devel >= %{version}
+BuildRequires:	xfconf-devel >= %{version}
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
-Requires:	xdg-menus
+Requires:	xfce4-panel >= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,12 +39,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-mv -f po/{pt_PT,pt}.po
-mv -f po/{nb_NO,nb}.po
 
 %build
 %{__glib_gettextize}
@@ -61,7 +53,6 @@
 	--enable-exo \
 	--enable-file-icons \
 	--enable-panel-plugin \
-	--enable-menueditor \
 	--enable-thunarx
 
 %{__make}
@@ -72,10 +63,10 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/xfce4/desktop/menu.xml.nb{_NO,}
-mv -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.nb{_NO,}
+mv $RPM_BUILD_ROOT%{_datadir}/locale/nb{_NO,}
+mv $RPM_BUILD_ROOT%{_datadir}/locale/pt{_PT,}
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/{mcs-plugins,panel-plugins,modules}/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/{panel-plugins,modules}/*.{la,a}
 
 %find_lang %{name}
 
@@ -91,76 +82,23 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
-%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) %{_bindir}/xfce4-popup-menu
+%attr(755,root,root) %{_bindir}/xfdesktop
+%attr(755,root,root) %{_bindir}/xfdesktop-settings
+%dir %{_libdir}/xfce4/modules
+%attr(755,root,root) %{_libdir}/xfce4/modules/xfce4_desktop_menu.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(da) %{_datadir}/xfce4/doc/da/*
 %lang(fr) %{_datadir}/xfce4/doc/fr/*
+%lang(ja) %{_datadir}/xfce4/doc/ja/*
 %{_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(be) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.be
-%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
-%lang(de) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.de
-%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
-%lang(hu) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.hu
-%lang(it) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.it
-%lang(ja) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.ja
-%lang(ko) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.ko
-%lang(nb) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.nb
-%lang(nl) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.nl
-%lang(pa) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.pa
-%lang(pl) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.pl
-%lang(pt_BR) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.pt_BR
-%lang(ro) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.ro
-%lang(ru) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.ru
-%lang(sk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.sk
-%lang(sv) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.sv
-%lang(tr) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.tr
-%lang(uk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.uk
-%lang(vi) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.vi
-%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(it) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.it
-%lang(ja) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.ja
-%lang(nb) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.nb
-%lang(nl) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.nl
-%lang(pl) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.pl
-%lang(pt_BR) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.pt_BR
-%lang(ro) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.ro
-%lang(ru) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.ru
-%lang(sk) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.sk
-%lang(sv) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.sv
-%lang(tr) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.tr
-%lang(zh_CN) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_CN
-%lang(zh_TW) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_TW
-
+%{_sysconfdir}/xdg/menus
 %{_desktopdir}/*.desktop
+%{_datadir}/desktop-directories/*
 %{_datadir}/xfce4/backdrops
 %{_datadir}/xfce4/panel-plugins/*
 %{_pixmapsdir}/*
@@ -172,6 +110,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2009/02/28 14:24:57  megabajt
+- updated to 4.6.0
+- removed obsolete -locale-names.patch, -desktop.patch and -ac_fix.patch
+
 Revision 1.76  2008/10/28 12:02:22  blues
 - ac_fix patch added - builds now
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xfdesktop.spec?r1=1.76&r2=1.77&f=u



More information about the pld-cvs-commit mailing list