packages: xfce-utils/xfce-utils.spec - rel 2 - dirs cleanup - am install fix

[baggins]

Author: baggins                      Date: Thu Nov 11 20:58:36 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- dirs cleanup
- am install fix

---- Files affected:
packages/xfce-utils:
   xfce-utils.spec (1.70 -> 1.71) 

---- Diffs:

================================================================
Index: packages/xfce-utils/xfce-utils.spec
diff -u packages/xfce-utils/xfce-utils.spec:1.70 packages/xfce-utils/xfce-utils.spec:1.71
--- packages/xfce-utils/xfce-utils.spec:1.70	Mon Apr 27 09:57:40 2009
+++ packages/xfce-utils/xfce-utils.spec	Thu Nov 11 21:58:30 2010
@@ -3,13 +3,14 @@
 Summary(pl.UTF-8):	Narzędzia dla środowiska Xfce
 Name:		xfce-utils
 Version:	4.6.1
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	1aa2362b11e79e56d52ce0d265faf1b6
 Source1:	xfce4-xsession.desktop
 Patch0:		%{name}-gxmessage.patch
+Patch1:		%{name}-am.patch
 URL:		http://www.xfce.org/projects/xfce-utils/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -26,6 +27,7 @@
 Requires:	gxmessage
 Requires:	libxfcegui4 >= %{version}
 Requires:	which
+Requires:	xfce4-dirs >= 4.6
 Requires:	xlockmore
 Requires:	xorg-app-xrdb
 Conflicts:	xfce4-session < 0.1.1-2
@@ -40,6 +42,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -104,12 +107,14 @@
 %{_datadir}/xfce4/LGPL
 %{_datadir}/xfce4/GPL
 
-%docdir %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/doc/xfce*.css
 %{_datadir}/xfce4/doc/xfce-mouse.png
-%{_datadir}/xfce4/doc/C/*
-%lang(fr) %{_datadir}/xfce4/doc/fr/*
-%lang(it) %{_datadir}/xfce4/doc/it/*
+%{_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
+
 %{_iconsdir}/hicolor/*/*/*
 
 %{_datadir}/xsessions/xfce4.desktop
@@ -120,6 +125,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71  2010/11/11 20:58:30  baggins
+- rel 2
+- dirs cleanup
+- am install fix
+
 Revision 1.70  2009/04/27 07:57:40  adamg
 - updated to 4.6.1
 
================================================================

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