From 938eddf66fc056a26ef758a15a69b3dca06f3c60 Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert@fedoraproject.org>
Date: Mar 02 2009 21:10:51 +0000
Subject: - Fix directory ownership problems

- Move exo-csource into devel package
- Make devel package require pkgconfig and gtk-doc
- Mark gtk-doc files as %doc

---

diff --git a/exo.spec b/exo.spec
index f73b762..56cd348 100644
--- a/exo.spec
+++ b/exo.spec
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.100
-Release: 1%{?dist}
+Release: 2%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
@@ -13,6 +13,7 @@ Patch0: exo-0.3.0-x86_64-build.patch
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus-glib >= 0.22
+Requires: xfce4-doc
 BuildRequires: dbus-devel >= 0.22
 BuildRequires: gtk-doc
 BuildRequires: pygtk2-devel
@@ -23,6 +24,7 @@ BuildRequires: libxfce4util-devel
 BuildRequires: hal-devel libnotify-devel
 BuildRequires: intltool >= 0.31
 BuildRequires: chrpath
+BuildRequires: desktop-file-utils
 
 %description
 Extension library for Xfce, targeted at application development.
@@ -33,9 +35,11 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libxfce4util-devel
 Requires: hal-devel
+Requires: pkgconfig
+Requires: gtk-doc
 
 %description devel
-Static libraries and header files for the exo library.
+Development tools and static libraries and header files for the exo library.
 
 %package -n python-exo
 Summary: Python tools for exo library
@@ -70,6 +74,11 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-0.3/_exo.so
 
 %find_lang libexo-0.3
 
+desktop-file-install                                       \
+  --delete-original                                        \
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/exo-preferred-applications.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -92,16 +101,9 @@ fi
 %doc AUTHORS ChangeLog HACKING NEWS README THANKS TODO COPYING
 %{_libdir}/lib*.so.*
 %{_datadir}/xfce4/helpers
-%{_datadir}/xfce4/doc/C
-%{_datadir}/xfce4/doc/es
-%{_datadir}/xfce4/doc/ja
-%{_datadir}/xfce4/doc/fr
-%{_datadir}/xfce4/doc/id
-%{_datadir}/xfce4/doc/pt_BR
-%{_datadir}/xfce4/doc/tr
-%{_mandir}/man1/exo-csource.1.gz
+%doc %{_datadir}/xfce4/doc/*/images/*
+%doc %{_datadir}/xfce4/doc/*/*.html
 %{_mandir}/man1/exo-open.1.gz
-%{_bindir}/exo-csource
 %{_bindir}/exo-desktop-item-edit
 %{_bindir}/exo-open
 %{_bindir}/exo-preferred-applications
@@ -113,19 +115,18 @@ fi
 %{_libexecdir}/exo-mount-notify-0.3
 %{_libexecdir}/exo-compose-mail-0.3
 %{_datadir}/applications/exo-preferred-applications.desktop
-%{_datadir}/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
-%{_datadir}/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
-%{_datadir}/icons/hicolor/48x48/apps/applications-internet.png
-%{_datadir}/icons/hicolor/48x48/apps/applications-other.png
+%{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/pixmaps/exo-0.3/exo-thumbnail-frame.png
 
 %files devel
 %defattr(-, root, root,-)
 %doc %{_datadir}/gtk-doc/html/exo/
+%{_bindir}/exo-csource
 %{_includedir}/exo*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/pygtk/*/defs/exo-*/
+%{_mandir}/man1/exo-csource.1.gz
 
 %files -n python-exo
 %defattr(-, root, root,-)
@@ -133,6 +134,12 @@ fi
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Mon Mar 02 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.100-2
+- Fix directory ownership problems
+- Move exo-csource into devel package
+- Make devel package require pkgconfig and gtk-doc
+- Mark gtk-doc files as %%doc
+
 * Thu Feb 26 2009 Kevin Fenzi <kevin@tummy.com> - 0.3.100-1
 - Update to 0.3.100
 - Remove some unneeded BuildRequires