SPECS: xfdesktop.spec - merged from DEVEL
freetz
freetz at pld-linux.org
Sun Jul 16 20:34:29 CEST 2006
Author: freetz Date: Sun Jul 16 18:34:29 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SPECS:
xfdesktop.spec (1.61 -> 1.62)
---- Diffs:
================================================================
Index: SPECS/xfdesktop.spec
diff -u SPECS/xfdesktop.spec:1.61 SPECS/xfdesktop.spec:1.62
--- SPECS/xfdesktop.spec:1.61 Thu Apr 20 11:32:14 2006
+++ SPECS/xfdesktop.spec Sun Jul 16 20:34:24 2006
@@ -1,39 +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.3.90.2
+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: 69904948c56287df099b556352a755c2
Patch0: %{name}-locale-names.patch
-Patch1: %{name}-vfmg.patch
URL: http://www.xfce.org/
+BuildRequires: Thunar-devel >= 0.3.2
BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 1:2.2.0
+BuildRequires: gtk+2-devel >= 2:2.10.0
BuildRequires: intltool
+BuildRequires: libexo-devel >= 0.3.1.8
BuildRequires: libtool
BuildRequires: libxfce4mcs-devel >= %{version}
BuildRequires: libxfcegui4-devel >= %{version}
-BuildRequires: libxml2-devel >= 2.4.0
+BuildRequires: libxml2-devel >= 1:2.6.26
BuildRequires: pkgconfig >= 1:0.9.0
-BuildRequires: xfce-mcs-manager-devel >= %{version}
-BuildRequires: xfce4-dev-tools
+BuildRequires: xfce4-dev-tools >= %{version}
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(post,postun): gtk+2 >= 2:2.10.0
Requires: libxfce4mcs >= %{version}
Requires: libxfcegui4 >= %{version}
+Requires: xdg-menus
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -45,19 +40,19 @@
%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
+%{__aclocal}
%{__autoheader}
%{__automake}
%{__autoconf}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
%configure
%{__make}
@@ -68,7 +63,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,13 +70,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 xfce4 > %{_sysconfdir}/xdg/xfce4/desktop/menu2.xml 2>/dev/null ||:
-%endif
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
%files -f %{name}.lang
%defattr(644,root,root,755)
@@ -90,11 +82,12 @@
%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/xfce4-menueditor.ui
%docdir %{_datadir}/xfce4/doc
%{_datadir}/xfce4/doc/C/*
%lang(fr) %{_datadir}/xfce4/doc/fr/*
-%lang(he) %{_datadir}/xfce4/doc/he/*
+%lang(it) %{_datadir}/xfce4/doc/it/*
%{_mandir}/man1/*.1*
%dir %{_sysconfdir}/xdg/xfce4/desktop
@@ -107,6 +100,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
@@ -126,8 +120,11 @@
%{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml
%lang(cs) %{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml.cs
+%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
@@ -142,6 +139,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/*
@@ -151,6 +149,22 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+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.61 2006/04/20 09:32:14 ankry
- tab
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/xfdesktop.spec?r1=1.61&r2=1.62&f=u
More information about the pld-cvs-commit
mailing list