SPECS (AC-branch): xfce-utils.spec - updated to 4.4.0, merged from...

megabajt megabajt at pld-linux.org
Mon Jan 29 09:50:45 CET 2007 

Author: megabajt                     Date: Mon Jan 29 08:50:45 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- updated to 4.4.0, merged from HEAD

---- Files affected:
SPECS:
   xfce-utils.spec (1.49.2.2 -> 1.49.2.3) 

---- Diffs:

================================================================
Index: SPECS/xfce-utils.spec
diff -u SPECS/xfce-utils.spec:1.49.2.2 SPECS/xfce-utils.spec:1.49.2.3
--- SPECS/xfce-utils.spec:1.49.2.2	Wed Jul  5 11:49:51 2006
+++ SPECS/xfce-utils.spec	Mon Jan 29 09:50:40 2007
@@ -1,16 +1,17 @@
 # $Revision$, $Date$
+#
 # Conditional build:
 %bcond_with	gtkhtml		# build with gtkhtml support
 #
 Summary:	Utilities for the Xfce Desktop Environment
 Summary(pl):	Narzędzia dla środowiska Xfce
 Name:		xfce-utils
-Version:	4.2.3
+Version:	4.4.0
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://www.us.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5:	8028266d03c5bae7c7ccbddd6656ea97
+Source0:	http://www.us.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	e90a98cf6de0610170c39a4eae36ad8f
 Source1:	xfce4-xsession.desktop
 Patch0:		%{name}-locale-names.patch
 Patch1:		%{name}-gxmessage.patch
@@ -18,18 +19,23 @@
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	dbh-devel >= 1.0
+BuildRequires:	dbus-glib-devel >= 0.62
 BuildRequires:	gettext-devel
 %{?with_gtkhtml:BuildRequires:	gtkhtml-devel}
 BuildRequires:	libtool
 BuildRequires:	libxfce4mcs-devel >= %{version}
 BuildRequires:	libxfcegui4-devel >= %{version}
 BuildRequires:	pkgconfig >= 1:0.9.0
+BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	xfce-mcs-manager-devel >= %{version}
 BuildRequires:	xfce4-dev-tools
+Requires(post,postun):	gtk+2
+Requires(post,postun):	hicolor-icon-theme
 Requires:	gxmessage
 Requires:	libxfce4mcs >= %{version}
 Requires:	libxfcegui4 >= %{version}
 Requires:	xfce-mcs-manager >= %{version}
+Requires:	xlockmore
 Conflicts:	xfce4-session < 0.1.1-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,7 +54,7 @@
 
 %build
 %{__libtoolize}
-%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros
+%{__aclocal}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
@@ -64,11 +70,12 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.{la,a}
-#rm -f $RPM_BUILD_ROOT%{_datadir}/xfce4/COPYING*
-#rm -f $RPM_BUILD_ROOT%{_datadir}/xfce4/{BSD,LGPL,GPL}*
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11/{dm,gdm,wmsession.d}
 rm -f $RPM_BUILD_ROOT%{_datadir}/xsessions/xfce.desktop
 
+# switchdesk provides Xclients.Xfce4
+rm -rf $RPM_BUILD_ROOT%{_datadir}/apps
+
 install -d $RPM_BUILD_ROOT%{_datadir}/xsessions
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xsessions/xfce4.desktop
 
@@ -77,92 +84,42 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_icon_cache hicolor
+
+%postun
+%update_icon_cache hicolor
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS TODO
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/xfce4/mcs-plugins/*.so
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/xinitrc
-
-%{_desktopdir}/xfce-taskbar-settings.desktop
-
+%{_datadir}/dbus-1/services/*.service
 %{_datadir}/xfce4/AUTHORS
-%lang(az) %{_datadir}/xfce4/AUTHORS.az
-%lang(ca) %{_datadir}/xfce4/AUTHORS.ca
-%lang(de) %{_datadir}/xfce4/AUTHORS.de
-%lang(es) %{_datadir}/xfce4/AUTHORS.es
-%lang(eu) %{_datadir}/xfce4/AUTHORS.eu
-%lang(fi) %{_datadir}/xfce4/AUTHORS.fi
-%lang(fr) %{_datadir}/xfce4/AUTHORS.fr
-%lang(he) %{_datadir}/xfce4/AUTHORS.he
-%lang(it) %{_datadir}/xfce4/AUTHORS.it
-%lang(ja) %{_datadir}/xfce4/AUTHORS.ja
-%lang(lt) %{_datadir}/xfce4/AUTHORS.lt
-%lang(ro) %{_datadir}/xfce4/AUTHORS.ro
-%lang(ru) %{_datadir}/xfce4/AUTHORS.ru
-%lang(sk) %{_datadir}/xfce4/AUTHORS.sk
-%lang(uk) %{_datadir}/xfce4/AUTHORS.uk
-%lang(vi) %{_datadir}/xfce4/AUTHORS.vi
-%lang(zh_TW) %{_datadir}/xfce4/AUTHORS.zh_TW
-%{_datadir}/xfce4/AUTHORS.html
-%lang(az) %{_datadir}/xfce4/AUTHORS.html.az
-%lang(ca) %{_datadir}/xfce4/AUTHORS.html.ca
-%lang(de) %{_datadir}/xfce4/AUTHORS.html.de
-%lang(es) %{_datadir}/xfce4/AUTHORS.html.es
-%lang(eu) %{_datadir}/xfce4/AUTHORS.html.eu
-%lang(fi) %{_datadir}/xfce4/AUTHORS.html.fi
-%lang(fr) %{_datadir}/xfce4/AUTHORS.html.fr
-%lang(it) %{_datadir}/xfce4/AUTHORS.html.it
-%lang(ja) %{_datadir}/xfce4/AUTHORS.html.ja
-%lang(lt) %{_datadir}/xfce4/AUTHORS.html.lt
-%lang(ro) %{_datadir}/xfce4/AUTHORS.html.ro
-%lang(ru) %{_datadir}/xfce4/AUTHORS.html.ru
-%lang(sk) %{_datadir}/xfce4/AUTHORS.html.sk
-%lang(vi) %{_datadir}/xfce4/AUTHORS.html.vi
-%lang(zh_TW) %{_datadir}/xfce4/AUTHORS.html.zh_TW
 %{_datadir}/xfce4/INFO
-%{_datadir}/xfce4/INFO.html
 %lang(ca) %{_datadir}/xfce4/INFO.ca
 %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(lt) %{_datadir}/xfce4/INFO.lt
-%lang(ro) %{_datadir}/xfce4/INFO.ro
 %lang(ru) %{_datadir}/xfce4/INFO.ru
 %lang(uk) %{_datadir}/xfce4/INFO.uk
 %lang(vi) %{_datadir}/xfce4/INFO.vi
-%lang(ca) %{_datadir}/xfce4/INFO.html.ca
-%lang(de) %{_datadir}/xfce4/INFO.html.de
-%lang(es) %{_datadir}/xfce4/INFO.html.es
-%lang(fi) %{_datadir}/xfce4/INFO.html.fi
-%lang(fr) %{_datadir}/xfce4/INFO.html.fr
-%lang(it) %{_datadir}/xfce4/INFO.html.it
-%lang(ja) %{_datadir}/xfce4/INFO.html.ja
-%lang(lt) %{_datadir}/xfce4/INFO.html.lt
-%lang(ro) %{_datadir}/xfce4/INFO.html.ro
-%lang(ru) %{_datadir}/xfce4/INFO.html.ru
 %{_datadir}/xfce4/COPYING
-%{_datadir}/xfce4/COPYING.html
-%lang(vi) %{_datadir}/xfce4/COPYING.vi
 %{_datadir}/xfce4/BSD
-%{_datadir}/xfce4/BSD.html
 %{_datadir}/xfce4/LGPL
-%{_datadir}/xfce4/LGPL.html
 %{_datadir}/xfce4/GPL
-%{_datadir}/xfce4/GPL.html
 
 %docdir %{_datadir}/xfce4/doc
-%{_datadir}/xfce4/doc/xfce.css
-%{_datadir}/xfce4/doc/xfce-rtl.css
+%{_datadir}/xfce4/doc/xfce*.css
 %{_datadir}/xfce4/doc/xfce-mouse.png
 %{_datadir}/xfce4/doc/C/*
 %lang(fr) %{_datadir}/xfce4/doc/fr/*
-%lang(he) %{_datadir}/xfce4/doc/he/*
+%lang(it) %{_datadir}/xfce4/doc/it/*
 %{_iconsdir}/hicolor/*/*/*
 
-%{_datadir}/apps/switchdesk/Xclients.xfce4
 %{_datadir}/xsessions/xfce4.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -171,6 +128,26 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49.2.3  2007/01/29 08:50:40  megabajt
+- updated to 4.4.0, merged from HEAD
+
+Revision 1.59  2007/01/22 17:59:53  megabajt
+- updated to 4.4.0
+
+Revision 1.58  2006/11/06 20:09:44  megabajt
+- up to 4.3.99.2 (Xfce 4.4RC2)
+
+Revision 1.57  2006/09/19 17:56:06  megabajt
+- remove /usr/share/apps/switchdesk/Xclients.Xfce4
+  (switchdesk provides this file)
+- release 2
+
+Revision 1.56  2006/09/06 18:04:25  megabajt
+- added %update_icon_cache macro
+
+Revision 1.55  2006/09/06 12:43:54  charles
+- updated to 4.3.99.1
+
 Revision 1.49.2.2  2006/07/05 09:49:51  havner
 - removed R: xlockware, its either it or xscreensaver
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xfce-utils.spec?r1=1.49.2.2&r2=1.49.2.3&f=u

More information about the pld-cvs-commit mailing list