diff --git a/.cvsignore b/.cvsignore index 952e857..c28ee25 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -exo-0.3.104.tar.bz2 +exo-0.3.105.tar.bz2 diff --git a/exo-0.3.105-fix-low-transfer-rates.patch b/exo-0.3.105-fix-low-transfer-rates.patch new file mode 100644 index 0000000..e961c71 --- /dev/null +++ b/exo-0.3.105-fix-low-transfer-rates.patch @@ -0,0 +1,25 @@ +From 7aad4f152380e1d2edffdc9a2eb15554f042fbad Mon Sep 17 00:00:00 2001 +From: Nick Schermer +Date: Sun, 18 Oct 2009 22:47:32 +0000 +Subject: Only sync devices with no volume. + +If the devices is pollable and we set the sync option, this +will slowdown the transfer. I missed that when changing the +code. +--- +diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c +index bbf9ca3..d09d0db 100644 +--- a/exo-mount/exo-mount-hal.c ++++ b/exo-mount/exo-mount-hal.c +@@ -741,7 +741,8 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device, + { + option = NULL; + +- if (strcmp (device->fsoptions[m], "sync") == 0) ++ if (strcmp (device->fsoptions[m], "sync") == 0 ++ && device->volume == NULL) + { + /* non-pollable drive... */ + option = g_strdup ("sync"); +-- +cgit v0.8.2.1 diff --git a/exo-0.3.105-mount-utf8.patch b/exo-0.3.105-mount-utf8.patch new file mode 100644 index 0000000..0e782d8 --- /dev/null +++ b/exo-0.3.105-mount-utf8.patch @@ -0,0 +1,25 @@ +--- exo-0.3.105/exo-mount/mount.rc.orig 2009-10-18 17:53:04.000000000 +0200 ++++ exo-0.3.105/exo-mount/mount.rc 2009-10-19 02:27:01.000000000 +0200 +@@ -34,12 +34,14 @@ + + [vfat] + uid= ++utf8=true + shortname=winnt + # FreeBSD specific option + longnames=true + + [iso9660] + uid= ++utf8=true + + [udf] + uid= +@@ -47,6 +49,7 @@ + + [ntfs] + uid= ++utf8=true + + [ntfs-3g] + uid= diff --git a/exo.spec b/exo.spec index 0e8cc3e..eed25bf 100644 --- a/exo.spec +++ b/exo.spec @@ -2,7 +2,7 @@ Summary: Application library for the Xfce desktop environment Name: exo -Version: 0.3.104 +Version: 0.3.105 Release: 1%{?dist} # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+ # everything else is LGPLv2+ @@ -10,6 +10,10 @@ License: LGPLv2+ and GPLv2+ URL: http://xfce.org/ Source0: http://archive.xfce.org/src/xfce/exo/0.3/%{name}-%{version}.tar.bz2 Patch0: exo-0.3.0-x86_64-build.patch +# http://git.xfce.org/xfce/exo/patch/?id=7aad4f152380e1d2edffdc9a2eb15554f042fbad +Patch1: exo-0.3.105-fix-low-transfer-rates.patch +# to not bring https://bugzilla.redhat.com/show_bug.cgi?id=508823 back +Patch2: exo-0.3.105-mount-utf8.patch Group: System Environment/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: dbus-glib >= 0.22 @@ -53,6 +57,8 @@ Python libraries and header files for the exo library. %setup -q %patch0 -p1 -b .x86_64-build +%patch1 -p1 -b .sync +%patch2 -p1 -b .utf8 %build %configure --enable-gtk-doc --disable-static @@ -100,11 +106,12 @@ 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 +%config(noreplace) %{_sysconfdir}/xdg/xfce4/mount.rc %{_libdir}/lib*.so.* %{_datadir}/xfce4/helpers %doc %{_datadir}/xfce4/doc/*/images/* %doc %{_datadir}/xfce4/doc/*/*.html -%{_mandir}/man1/exo-open.1.gz +%{_mandir}/man1/exo-open.1.* %{_bindir}/exo-desktop-item-edit %{_bindir}/exo-open %{_bindir}/exo-preferred-applications @@ -121,13 +128,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files devel %defattr(-, root, root,-) -%doc %{_datadir}/gtk-doc/html/exo/ +%doc %{_datadir}/gtk-doc/html/exo-0.3/ %{_bindir}/exo-csource %{_includedir}/exo* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %{_datadir}/pygtk/*/defs/exo-*/ -%{_mandir}/man1/exo-csource.1.gz +%{_mandir}/man1/exo-csource.1.* %files -n python-exo %defattr(-, root, root,-) @@ -135,6 +142,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{python_sitearch}/pyexo.* %changelog +* Sun Oct 19 2009 Christoph Wickert - 0.3.105-1 +- Update to 0.3.105 +- Tweak mount.rc to use UTF-8 (to not bring back #508823 again) + * Sat Oct 10 2009 Christoph Wickert - 0.3.104-1 - Update to 0.3.104 diff --git a/sources b/sources index a73b1dd..54424b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2cf8c5f53dda6136550f8185626c745 exo-0.3.104.tar.bz2 +ba87f84894498bf23ae39d849c55f98c exo-0.3.105.tar.bz2