rpms/exo/F-11 exo-0.3.101-default-mount-options.patch, NONE, 1.1 exo.spec, 1.36, 1.37

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/exo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14210

Modified Files:
	exo.spec 
Added Files:
	exo-0.3.101-default-mount-options.patch 
Log Message:
* Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.101-4
- Mount vfat and ntfs volumes with UTF-8 (#508823)
- Mount ntfs with ntfs-3g


exo-0.3.101-default-mount-options.patch:
 exo-mount-hal.c |   24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

--- NEW FILE exo-0.3.101-default-mount-options.patch ---
diff -Nur -x '*.orig' -x '*~' exo-0.3.4/exo-mount/exo-mount-hal.c exo-0.3.4.new/exo-mount/exo-mount-hal.c
--- exo-0.3.4/exo-mount/exo-mount-hal.c	2008-03-04 19:25:43.000000000 +0100
+++ exo-0.3.4.new/exo-mount/exo-mount-hal.c	2008-03-04 19:26:14.000000000 +0100
@@ -676,6 +676,18 @@
   /* check if we know any valid mount options */
   if (G_LIKELY (device->fsoptions != NULL))
     {
+      /* use utf8 on ubuntu by default */
+      if (strcmp (device->fstype, "vfat") == 0
+       || strcmp (device->fstype, "iso9660") == 0)
+        {
+          options[n++] = g_strdup_printf ("utf8");
+        }
+      /* pass the correct locale to ntfs-3g on ubuntu */
+      if (strcmp (device->fstype, "ntfs") == 0)
+        {
+          options[n++] = g_strdup_printf ("locale=%s", setlocale (LC_ALL, ""));
+        }
+
       /* process all valid mount options */
       for (m = 0; device->fsoptions[m] != NULL; ++m)
         {
@@ -725,8 +737,16 @@
               ? exo_str_replace (mount_point, G_DIR_SEPARATOR_S, "_") 
               : g_strdup ("");
 
-  /* let HAL guess the fstype */
-  fstype = g_strdup ("");
+  if (strcmp (device->fstype, "ntfs") == 0)
+    {
+      /* override ntfs with ntfs-3g on ubuntu */
+      fstype = g_strdup ("ntfs-3g");
+    }
+  else
+    {
+      /* let HAL guess the fstype */
+      fstype = g_strdup ("");
+    }
 
   /* setup the D-Bus error */
   dbus_error_init (&derror);


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-11/exo.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- exo.spec	19 Jul 2009 07:54:49 -0000	1.36
+++ exo.spec	10 Sep 2009 05:27:08 -0000	1.37
@@ -3,14 +3,17 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.101
-Release: 2%{?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 th
 
 %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,13 @@ fi
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Sep 10 2009 Christoph Wickert <cwickert at 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 at lists.fedoraproject.org> - 0.3.101-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 17 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.101-2
 - Add patch to fix url quoting (bug #509730)