packages: xfce-utils/xfce-utils.spec - merged from DEVEL

Wed Feb 16 19:49:39 CET 2011

Author: megabajt                     Date: Wed Feb 16 18:49:39 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/xfce-utils:
   xfce-utils.spec (1.75 -> 1.76) 

---- Diffs:

================================================================
Index: packages/xfce-utils/xfce-utils.spec
diff -u packages/xfce-utils/xfce-utils.spec:1.75 packages/xfce-utils/xfce-utils.spec:1.76

--- packages/xfce-utils/xfce-utils.spec:1.75	Fri Feb  4 19:24:11 2011
+++ packages/xfce-utils/xfce-utils.spec	Wed Feb 16 19:49:34 2011
@@ -2,15 +2,15 @@
 Summary:	Utilities for the Xfce Desktop Environment
 Summary(pl.UTF-8):	Narzędzia dla środowiska Xfce
 Name:		xfce-utils
-Version:	4.6.2
-Release:	2
+Version:	4.8.1
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	5d23407700d7e8c9751e17a5bc955109
+Source0:	http://archive.xfce.org/src/xfce/xfce-utils/4.8/%{name}-%{version}.tar.bz2
+# Source0-md5:	e39866365a45f7a1e7284b93eb4f92f0
 Source1:	xfce4-xsession.desktop
 Patch0:		%{name}-gxmessage.patch
-URL:		http://www.xfce.org/projects/xfce-utils/
+URL:		http://www.xfce.org/projects/xfce-utils
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.62
@@ -18,18 +18,23 @@
 BuildRequires:	gtk+2-devel >= 2:2.10.6
 BuildRequires:	intltool
 BuildRequires:	libtool
-BuildRequires:	libxfcegui4-devel >= %{version}
+BuildRequires:	libxfce4ui-devel >= 4.8.0
+BuildRequires:	libxfce4util-devel >= 4.8.0
+BuildRequires:	libxfcegui4-devel >= 4.8.0
 BuildRequires:	pkgconfig >= 1:0.9.0
-BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	xfce4-dev-tools >= 4.6.0
-Requires(post,postun):	gtk-update-icon-cache
-Requires(post,postun):	hicolor-icon-theme
+BuildRequires:	rpmbuild(macros) >= 1.601
+BuildRequires:	xfce4-dev-tools >= 4.8.0
+Requires:	gtk-update-icon-cache
 Requires:	gxmessage
-Requires:	libxfcegui4 >= %{version}
+Requires:	hicolor-icon-theme
+Requires:	libxfce4ui >= 4.8.0
+Requires:	perl-XML-Parser
 Requires:	which
 Requires:	xfce4-dirs >= 4.6
 Requires:	xlockmore
 Requires:	xorg-app-xrdb
+Requires:	xorg-app-xinit
+Requires:	xorg-app-xsetroot
 Conflicts:	xfce4-session < 0.1.1-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -50,7 +55,9 @@
 %{__autoheader}
 %{__automake}
 %{__autoconf}
-%configure
+%configure \
+	--disable-silent-rules
+
 %{__make}
 
 %install
@@ -60,16 +67,12 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11/{dm,gdm,wmsession.d}
-rm -f $RPM_BUILD_ROOT%{_datadir}/xsessions/xfce.desktop
-
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
-
-# switchdesk provides Xclients.Xfce4
-rm -rf $RPM_BUILD_ROOT%{_datadir}/apps
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/xsessions/xfce.desktop
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xsessions/xfce4.desktop
 
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+
 %find_lang %{name}
 
 %clean
@@ -91,33 +94,22 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/Xft.xrdb
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/xinitrc
 %{_datadir}/dbus-1/services/*.service
-%{_datadir}/xfce4/AUTHORS
-%{_datadir}/xfce4/INFO
-%lang(ca) %{_datadir}/xfce4/INFO.ca
-%lang(de) %{_datadir}/xfce4/INFO.de
-%lang(es) %{_datadir}/xfce4/INFO.es
-%lang(fi) %{_datadir}/xfce4/INFO.fi
-%lang(fr) %{_datadir}/xfce4/INFO.fr
-%lang(it) %{_datadir}/xfce4/INFO.it
-%lang(ja) %{_datadir}/xfce4/INFO.ja
-%lang(ru) %{_datadir}/xfce4/INFO.ru
-%lang(uk) %{_datadir}/xfce4/INFO.uk
-%lang(vi) %{_datadir}/xfce4/INFO.vi
-%{_datadir}/xfce4/COPYING
-%{_datadir}/xfce4/BSD
-%{_datadir}/xfce4/LGPL
-%{_datadir}/xfce4/GPL
-
-%{_datadir}/xfce4/doc/xfce*.css
-%{_datadir}/xfce4/doc/xfce-mouse.png
-%{_datadir}/xfce4/doc/C/*.html
-%{_datadir}/xfce4/doc/C/images/*.jpg
-%{_datadir}/xfce4/doc/C/images/*.png
-%lang(fr) %{_datadir}/xfce4/doc/fr/*.html
-%lang(it) %{_datadir}/xfce4/doc/it/*.html
-
+%dir %{_docdir}/xfce-utils
+%dir %{_docdir}/xfce-utils/html
+%{_docdir}/xfce-utils/html/C
+%{_docdir}/xfce-utils/html/*.css
+%lang(da) %{_docdir}/xfce-utils/html/da
+%lang(el) %{_docdir}/xfce-utils/html/el
+%lang(gl) %{_docdir}/xfce-utils/html/gl
+%lang(it) %{_docdir}/xfce-utils/html/it
+%lang(ja) %{_docdir}/xfce-utils/html/ja
+%lang(sv) %{_docdir}/xfce-utils/html/sv
+%lang(ug) %{_docdir}/xfce-utils/html/ug
 %{_iconsdir}/hicolor/*/*/*
 
+%{_desktopdir}/xfce4-about.desktop
+%{_desktopdir}/xfhelp4.desktop
+%{_desktopdir}/xfrun4.desktop
 %{_datadir}/xsessions/xfce4.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -126,6 +118,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2011/02/16 18:49:34  megabajt
+- merged from DEVEL
+
+Revision 1.71.2.3  2011/02/11 13:01:59  megabajt
+- updated to 4.8.1
+
+Revision 1.71.2.2  2011/02/05 22:59:23  megabajt
+- updated to 4.8.0
+
 Revision 1.75  2011/02/04 18:24:11  wiget
 - Requires(post,postun): gtk-update-icon-cache
 
@@ -137,6 +138,9 @@
 
 Revision 1.72  2010/11/14 12:40:51  baggins
 - 4.6.2
+
+Revision 1.71.2.1  2010/11/14 12:13:49  baggins
+- 4.7.1, XFCE 4.8pre1
 
 Revision 1.71  2010/11/11 20:58:30  baggins
 - rel 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce-utils/xfce-utils.spec?r1=1.75&r2=1.76&f=u

