-#
-# 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
+Summary(pl.UTF-8): Zarządca pulpitu dla środowiska Xfce
Name: xfdesktop
-Version: 4.2.3
-Release: 1%{!?with_vfmg:novfmg}
+Version: 4.6.1
+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
-Patch0: %{name}-locale-names.patch
-Patch1: %{name}-vfmg.patch
-URL: http://www.xfce.org/
+Source0: http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5: ae15cacc3e3834cca7238a8e1035c50d
+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 >= 1:2.2.0
-BuildRequires: intltool
+BuildRequires: gtk+2-devel >= 2:2.10.6
+BuildRequires: intltool >= 0.35.0
+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 >= 2.4.0
BuildRequires: pkgconfig >= 1:0.9.0
-BuildRequires: xfce-mcs-manager-devel >= %{version}
-BuildRequires: xfce4-dev-tools
+BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: xfce4-dev-tools >= 4.6.0
BuildRequires: xfce4-panel-devel >= %{version}
-%if %{with vfmg}
-Requires(post): vfmg >= 0.9.95
-Requires: vfmg >= 0.9.18-8
-%endif
-Requires: libxfce4mcs >= %{version}
-Requires: libxfcegui4 >= %{version}
+BuildRequires: xfconf-devel >= %{version}
+Requires(post,postun): gtk+2
+Requires(post,postun): hicolor-icon-theme
+Requires: xfce4-panel >= %{version}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
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
-%{?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
-%{__libtoolize}
-%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros
+%{__glib_gettextize}
+%{__aclocal}
+%{__intltoolize}
%{__autoheader}
%{__automake}
-%{__autoconf}
-%configure
+%{__aclocal}
+%configure \
+ --enable-desktop-icons \
+ --enable-desktop-menu \
+ --enable-exo \
+ --enable-file-icons \
+ --enable-panel-plugin \
+ --enable-thunarx
%{__make}
%{__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}
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/{panel-plugins,modules}/*.{la,a}
%find_lang %{name}
%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
+%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
-%attr(755,root,root) %{_libdir}/xfce4/modules/*.so
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/*.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
+
%docdir %{_datadir}/xfce4/doc
%{_datadir}/xfce4/doc/C/*
+%lang(da) %{_datadir}/xfce4/doc/da/*
%lang(fr) %{_datadir}/xfce4/doc/fr/*
-%lang(he) %{_datadir}/xfce4/doc/he/*
+%lang(it) %{_datadir}/xfce4/doc/it/*
+%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(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(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(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(nl) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/desktop/menu.xml.nl
-%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(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(cs) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.cs
-%lang(eu) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.eu
-%lang(fi) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.fi
-%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
-%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(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}/*
%{_iconsdir}/hicolor/*/apps/*
projects / packages / xfdesktop.git / blobdiff