From 1fb2a7ac3723f3245cf767995272858f15a3a0e1 Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert@fedoraproject.org>
Date: Sep 10 2009 05:00:00 +0000
Subject: - Mount vfat and ntfs volumes with UTF-8 (#508823)

- Mount ntfs with ntfs-3g

---

diff --git a/exo.spec b/exo.spec
index 39c53eb..49a667c 100644
--- a/exo.spec
+++ b/exo.spec
@@ -3,14 +3,17 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.101
-Release: 3%{?dist}
+Release: 4%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
 URL: http://xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.6.1/src/exo-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
+# http://bugzilla.xfce.org/show_bug.cgi?id=5461
 Patch1: exo-0.3.101-url-quoting.patch
+# http://patches.ubuntu.com/e/exo/extracted/xubuntu-default-mount-options.patch
+Patch2: exo-0.3.101-default-mount-options.patch
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus-glib >= 0.22
@@ -55,6 +58,7 @@ Python libraries and header files for the exo library.
 
 %patch0 -p1 -b .x86_64-build
 %patch1 -p1 -b .url-quoting
+%patch2 -p1 -b .utf8
 
 %build
 %configure --enable-gtk-doc --disable-static
@@ -63,7 +67,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.la
@@ -85,19 +89,19 @@ desktop-file-install                                       \
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 /sbin/ldconfig
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f libexo-0.3.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog HACKING NEWS README THANKS TODO COPYING
@@ -136,6 +140,10 @@ fi
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Sep 10 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.101-4
+- Mount vfat and ntfs volumes with UTF-8 (#508823)
+- Mount ntfs with ntfs-3g
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.101-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild