-Summary: Desktop manager for the XFce Desktop Environment
-Summary(pl): Zarz±dca pulpitu dla ¶rodowiska XFce
+Summary: Desktop manager for the Xfce Desktop Environment
+Summary(pl.UTF-8): Zarządca pulpitu dla środowiska Xfce
Name: xfdesktop
-Version: 4.0.5
-Release: 6
-License: GPL
+Version: 4.11.7
+Release: 2
+License: GPL v2+
Group: X11/Applications
-#Source0: ftp://ftp.berlios.de/pub/xfce-goodies/%{version}/%{name}-%{version}.tar.gz
-Source0: http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5: eef02de6de0ac2b8343f4ce2c2f8cf12
-Patch0: %{name}-menu.patch
-Patch1: %{name}-locale-names.patch
-URL: http://www.xfce.org/
-BuildRequires: autoconf >= 2.50
-BuildRequires: automake
-BuildRequires: intltool
-BuildRequires: libtool
-BuildRequires: libxfce4mcs-devel >= %{version}
-BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: pkgconfig >= 0.9.0
-BuildRequires: xfce-mcs-manager-devel >= %{version}
-Requires(post): vfmg >= 0.9.16-2
-Requires: libxfce4mcs >= %{version}
-Requires: libxfcegui4 >= %{version}
-Requires: vfmg > 0.9.16-2
-Requires: xfce-mcs-manager >= %{version}
+Source0: http://archive.xfce.org/src/xfce/xfdesktop/4.11/%{name}-%{version}.tar.bz2
+# Source0-md5: c504d7208b6ddcb6e616780ef27bbb46
+URL: http://www.xfce.org/projects/xfdesktop
+BuildRequires: Thunar-devel >= 1.6.0
+BuildRequires: autoconf >= 2.60
+BuildRequires: automake >= 1:1.8
+BuildRequires: dbus-glib-devel >= 0.84
+BuildRequires: exo-devel >= 0.8.0
+BuildRequires: garcon-devel >= 0.3.0
+BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.30.0
+BuildRequires: gtk+2-devel >= 2:2.24.0
+BuildRequires: intltool >= 0.35.0
+BuildRequires: libnotify-devel >= 0.4.0
+BuildRequires: libtool >= 2:2.2.6
+BuildRequires: libwnck2-devel >= 2.30.0
+BuildRequires: libxfce4ui-devel >= 4.11.1
+BuildRequires: libxfce4util-devel >= 4.11.0
+BuildRequires: pkgconfig >= 1:0.9.0
+BuildRequires: rpmbuild(macros) >= 1.601
+BuildRequires: xfce4-dev-tools >= 4.11.0
+BuildRequires: xfconf-devel >= 4.10.0
+BuildRequires: xorg-lib-libSM-devel
+BuildRequires: xorg-lib-libX11-devel
+Requires: Thunar-libs >= 1.6.0
+Requires: dbus-glib >= 0.84
+Requires: exo >= 0.8.0
+Requires: garcon >= 0.3.0
+Requires: glib2 >= 1:2.30.0
+Requires: gtk+2 >= 2:2.24.0
+Requires: gtk-update-icon-cache
+Requires: hicolor-icon-theme
+Requires: libwnck2 >= 2.30.0
+Requires: libxfce4ui >= 4.11.1
+Requires: libxfce4util >= 4.11.0
+Requires: xfce4-dirs >= 4.6
+Requires: xfconf >= 4.10.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-xfdesktop contain a desktop manager for the XFce Desktop Environment.
+xfdesktop contain a desktop manager for the Xfce Desktop Environment.
-%description -l pl
-xfdesktop zawiera zarz±dcê pulpitu dla ¶rodowiska XFce.
+%description -l pl.UTF-8
+xfdesktop zawiera zarządcę pulpitu dla środowiska Xfce.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-
-mv -f po/{fa_IR,fa}.po
-mv -f po/{no,nb}.po
-mv -f po/{pt_PT,pt}.po
%build
-glib-gettextize --copy --force
-intltoolize --copy --force
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure
+%configure \
+ --disable-silent-rules \
+ --enable-desktop-icons \
+ --enable-desktop-menu \
+ --enable-file-icons \
+ --enable-thunarx
%{__make}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-touch $RPM_BUILD_ROOT%{_sysconfdir}/xfce4/menu2.xml
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.{la,a}
+# unify dir name (verify first that target doesn't exist)
+[ ! -e $RPM_BUILD_ROOT%{_datadir}/locale/fa ] || exit 1
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{fa_IR,fa}
+# just a copy of ur (.po files differ only by trailing junk)
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
%find_lang %{name}
rm -rf $RPM_BUILD_ROOT
%post
-vfmg -i -f -x -c -u -m xfce4 > %{_sysconfdir}/xfce4/menu2.xml 2>/dev/null
+%update_icon_cache hicolor
+
+%postun
+%update_icon_cache hicolor
%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
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu.xml
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu2.xml
-%lang(az) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu.xml.az
-%lang(ca) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu.xml.ca
-%lang(de) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu.xml.de
-%lang(fr) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu.xml.fr
-%lang(hu) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu.xml.hu
-%lang(it) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu.xml.it
-%lang(nl) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu.xml.nl
-%lang(pl) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu.xml.pl
-%lang(ta) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu.xml.ta
-%lang(tr) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu.xml.tr
-%lang(vi) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu.xml.vi
-%lang(zh_CN) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu.xml.zh_CN
-%lang(zh_TW) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/xfce4/menu.xml.zh_TW
-%{_datadir}/xfce4/backdrops
-%docdir %{_datadir}/xfce4/doc
-%{_datadir}/xfce4/doc/C/*.html
-%{_datadir}/xfce4/doc/C/images/*
-%lang(fr) %{_datadir}/xfce4/doc/fr/*.html
-%lang(fr) %{_datadir}/xfce4/doc/fr/images/*
+%attr(755,root,root) %{_bindir}/xfdesktop
+%attr(755,root,root) %{_bindir}/xfdesktop-settings
+%{_mandir}/man1/xfdesktop.1*
+%{_desktopdir}/xfce-backdrop-settings.desktop
+%{_pixmapsdir}/xfce4_xicon*.png
+%{_pixmapsdir}/xfdesktop
+%{_iconsdir}/hicolor/*/apps/xfce4-backdrop.*
+%{_iconsdir}/hicolor/*/apps/xfce4-menueditor.*
+%dir %{_datadir}/backgrounds/xfce
+%{_datadir}/backgrounds/xfce/xfce-blue.jpg