From f550d046daeed45260baa53f6252267a5498deb5 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Oct 10 2009 16:22:01 +0000 Subject: - Disable parallel make due to multilib conflicts. --- diff --git a/.cvsignore b/.cvsignore index 38e3668..f23faf9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -exo-0.3.101.tar.bz2 +exo-0.3.103.tar.bz2 diff --git a/exo-0.3.101-default-mount-options.patch b/exo-0.3.101-default-mount-options.patch deleted file mode 100644 index 1678062..0000000 --- a/exo-0.3.101-default-mount-options.patch +++ /dev/null @@ -1,41 +0,0 @@ -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); diff --git a/exo-0.3.101-url-quoting.patch b/exo-0.3.101-url-quoting.patch deleted file mode 100644 index 7246847..0000000 --- a/exo-0.3.101-url-quoting.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Nur exo-0.3.101.orig/exo-open/main.c exo-0.3.101/exo-open/main.c ---- exo-0.3.101.orig/exo-open/main.c 2009-04-11 04:09:56.000000000 -0600 -+++ exo-0.3.101/exo-open/main.c 2009-07-18 23:38:15.000000000 -0600 -@@ -35,7 +35,16 @@ - - #include - -- -+/** -+ * For testing this code the following commands should work: -+ * -+ * exo-open --launch WebBrowser http://xfce.org (bug #5461). -+ * exo-open http://xfce.org -+ * exo-open --launch TerminalEmulator ./script.sh 'something with a space' 'nospace' (bug #5132). -+ * exo-open --launch TerminalEmulator ssh -l username some.host.com -+ * xfterm4 -e ssh -l ssh -l username some.host.com (bug #5301, this generates line below) -+ * exo-open --launch TerminalEmulator 'ssh -l username some.host.com' -+ **/ - - static gboolean opt_help = FALSE; - static gboolean opt_version = FALSE; -@@ -142,6 +151,9 @@ - { - if (argc > 1) - { -+ -+ /* NOTE: see the comment at the top of this document! */ -+ - /* combine all specified parameters to one parameter string */ - join = g_string_new (NULL); - for (i = 1; argv[i] != NULL; i++) -@@ -150,10 +162,19 @@ - if (i > 1) - join = g_string_append_c (join, ' '); - -- /* append the quoted argument */ -- quoted = g_shell_quote (argv[i]); -- join = g_string_append (join, quoted); -- g_free (quoted); -+ /* only quote arguments with spaces if there are multiple -+ * arguments to be merged, this is a bit of magic to make -+ * common cares work property, see sample above with xfrun4 */ -+ if (argc > 2 && strchr (argv[i], ' ') != NULL) -+ { -+ quoted = g_shell_quote (argv[i]); -+ join = g_string_append (join, quoted); -+ g_free (quoted); -+ } -+ else -+ { -+ join = g_string_append (join, argv[i]); -+ } - } - parameter = g_string_free (join, FALSE); - } -@@ -162,6 +183,10 @@ - parameter = NULL; - } - -+#ifndef NDEBUG -+ g_message ("launch=%s, wd=%s, parameters (%d)=%s", opt_launch, opt_working_directory, argc, parameter); -+#endif -+ - /* run the preferred application */ - if (!exo_execute_preferred_application (opt_launch, parameter, opt_working_directory, NULL, &err)) - { diff --git a/exo.spec b/exo.spec index 15165d9..fd9f47e 100644 --- a/exo.spec +++ b/exo.spec @@ -2,18 +2,14 @@ Summary: Application library for the Xfce desktop environment Name: exo -Version: 0.3.101 -Release: 5%{?dist} +Version: 0.3.103 +Release: 2%{?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 +Source0: http://archive.xfce.org/src/xfce/exo/0.3/%{name}-%{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 @@ -57,13 +53,12 @@ Python libraries and header files for the exo library. %setup -q %patch0 -p1 -b .x86_64-build -%patch1 -p1 -b .url-quoting -%patch2 -p1 -b .utf8 %build %configure --enable-gtk-doc --disable-static -make %{?_smp_mflags} +# using %{?_smp_mflags} causes a multilib conflict, disable it for now +make %install rm -rf $RPM_BUILD_ROOT @@ -78,9 +73,6 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-open chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/exo-helper-0.3 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-0.3/_exo.so -touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/evolution.desktop -touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/firefox.desktop - %find_lang libexo-0.3 desktop-file-install \ @@ -143,6 +135,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{python_sitearch}/pyexo.* %changelog +* Sat Oct 10 2009 Christoph Wickert - 0.3.103-2 +- Disable parallel make due to multilib conflicts. + +* Sat Oct 10 2009 Christoph Wickert - 0.3.103-1 +- Update to 0.3.103 +- Drop patches for URL quoting and default mount options (fixed upstream) +- Revert useless touch -r trick + * Wed Sep 30 2009 Kevin Fenzi - 0.3.101-5 - Use touch -r trick to fix multilib issue diff --git a/sources b/sources index 65e6ce7..2275082 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c0eebb360f53eab70454b70e1bde36e exo-0.3.101.tar.bz2 +16be1f98b09f6c72e8474d0776f74846 exo-0.3.103.tar.bz2