rpms/xfce-utils/devel xfce-utils.spec,1.28,1.29

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12248

Modified Files:
	xfce-utils.spec 
Log Message:
* Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
- Fix directory ownership problems
- Make separate xfce4-doc package



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xfce-utils.spec	27 Feb 2009 20:23:10 -0000	1.28
+++ xfce-utils.spec	2 Mar 2009 21:26:37 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
 Version: 4.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce-utils-%{version}.tar.bz2
@@ -16,6 +16,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xfwm4
 Requires: xfdesktop
+Requires: xfce4-doc
 Requires: /usr/bin/id
 BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: gettext
@@ -25,7 +26,16 @@
 BuildRequires: intltool
 
 %description
-This package includes utilities for the Xfce Desktop Environment
+This package includes utilities for the Xfce Desktop Environment.
+
+%package -n xfce4-doc
+Summary: Basic documentation for the Xfce Desktop Environment
+Group: Documentation
+BuildArch: noarch
+#Requires: %{name} = %{version}-%{release}
+
+%description -n xfce4-doc
+This package includes common docs for the Xfce Desktop Environment.
 
 %prep
 %setup -q
@@ -46,14 +56,12 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{xsessiondir}/xfce.desktop
 
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/
-
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/apps
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/
 
 %find_lang %{name}
 
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11
+# we need the doc package to own these 
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/xfce4/doc/{es,fr,id,it,ja,pt_BR,tr}/images
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,36 +85,53 @@
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/xinitrc
 %config(noreplace) %{_sysconfdir}/xdg/xfce4/Xft.xrdb
 %config(noreplace) %{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop
-%dir %{_libexecdir}/xfce4 
 %dir %{_libexecdir}/xfce4/xfconf-migration
 %{_libexecdir}/xfce4/xfconf-migration/xfconf-migration-4.6.pl
-%{_bindir}/*
-%{_datadir}/xfce4/AUTHORS
-%{_datadir}/xfce4/BSD
-%{_datadir}/xfce4/COPYING
-%{_datadir}/xfce4/GPL
-%{_datadir}/xfce4/INFO
-%lang(de) %{_datadir}/xfce4/INFO.de
-%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(ru) %{_datadir}/xfce4/INFO.ru
-%lang(en_GB) %{_datadir}/xfce4/INFO.uk
-%lang(vi) %{_datadir}/xfce4/INFO.vi
-%{_datadir}/xfce4/LGPL
-%{_datadir}/xfce4/doc/*/images/*
-%{_datadir}/xfce4/doc/*/*.html
-%{_datadir}/xfce4/doc/xfce-mouse.png
-%{_datadir}/xfce4/doc/xfce.css
-%{_datadir}/xfce4/doc/xfce-chunk.css
-%{_datadir}/icons/*/*/*
+%{_bindir}/startxfce4
+%{_bindir}/xfbrowser4
+%{_bindir}/xfce4-about
+%{_bindir}/xflock4
+%{_bindir}/xfmountdev4
+%{_bindir}/xfrun4
+%{_bindir}/xfterm4
+%{_datadir}/icons/hicolor/*/apps/*
 %{xsessiondir}/*
 %{_datadir}/dbus-1/services/org.xfce.RunDialog.service
 
+%files -n xfce4-doc
+%defattr(-,root,root,-)
+%{_bindir}/xfhelp4
+%dir %{_datadir}/xfce4
+%doc %{_datadir}/xfce4/AUTHORS
+%doc %{_datadir}/xfce4/BSD
+%doc %{_datadir}/xfce4/COPYING
+%doc %{_datadir}/xfce4/GPL
+%doc %{_datadir}/xfce4/INFO
+%doc %lang(de) %{_datadir}/xfce4/INFO.de
+%doc %lang(ca) %{_datadir}/xfce4/INFO.ca
+%doc %lang(es) %{_datadir}/xfce4/INFO.es
+%doc %lang(fi) %{_datadir}/xfce4/INFO.fi
+%doc %lang(fr) %{_datadir}/xfce4/INFO.fr
+%doc %lang(it) %{_datadir}/xfce4/INFO.it
+%doc %lang(ja) %{_datadir}/xfce4/INFO.ja
+%doc %lang(ru) %{_datadir}/xfce4/INFO.ru
+%doc %lang(en_GB) %{_datadir}/xfce4/INFO.uk
+%doc %lang(vi) %{_datadir}/xfce4/INFO.vi
+%doc %{_datadir}/xfce4/LGPL
+%dir %{_datadir}/xfce4/doc
+%dir %{_datadir}/xfce4/doc/*
+%dir %{_datadir}/xfce4/doc/*/images
+%doc %{_datadir}/xfce4/doc/*/images/*
+%doc %{_datadir}/xfce4/doc/*/*.html
+%doc %{_datadir}/xfce4/doc/xfce-mouse.png
+%doc %{_datadir}/xfce4/doc/xfce.css
+%doc %{_datadir}/xfce4/doc/xfce-chunk.css
+
 %changelog
+* Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.0-2
+- Fix directory ownership problems
+- Make separate xfce4-doc package
+
 * Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-1
 - Update to 4.6.0
 - Remove unneeded BuildRequires