diff --git a/.gitignore b/.gitignore index 3894375..789bcd9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ exo-0.3.107.tar.bz2 /exo-0.10.4.tar.bz2 /exo-0.10.6.tar.bz2 /exo-0.10.7.tar.bz2 +/exo-0.12.0.tar.bz2 diff --git a/exo-0.10.6-escaped-uri.patch b/exo-0.10.6-escaped-uri.patch deleted file mode 100644 index bb14c53..0000000 --- a/exo-0.10.6-escaped-uri.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -Nur exo-0.10.6.orig/exo-open/main.c exo-0.10.6/exo-open/main.c ---- exo-0.10.6.orig/exo-open/main.c 2015-05-25 12:04:45.000000000 -0600 -+++ exo-0.10.6/exo-open/main.c 2015-07-31 13:16:51.148691020 -0600 -@@ -206,11 +206,17 @@ - { - gchar *current_dir; - gchar *uri; -+ gchar *escaped_uri; - gchar *path; - - /* is an absolute path, return file uri */ - if (g_path_is_absolute (string)) -- return g_strconcat ("file://", string, NULL); -+ { -+ uri = g_strconcat ("file://", string, NULL); -+ escaped_uri = g_uri_escape_string (uri, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE); -+ g_free(uri); -+ return escaped_uri; -+ } - - /* treat it like a relative path */ - current_dir = g_get_current_dir (); -@@ -221,8 +227,10 @@ - if (g_file_test (path, G_FILE_TEST_EXISTS)) - { - uri = g_strconcat ("file://", path, NULL); -+ escaped_uri = g_uri_escape_string (uri, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE); - g_free (path); -- return uri; -+ g_free (uri); -+ return escaped_uri; - } - g_free (path); - -@@ -307,7 +315,6 @@ - { - GFile *file; - gchar *scheme; -- gchar *escaped; - GFileInfo *file_info; - gboolean succeed = FALSE; - gboolean retval = FALSE; -@@ -331,15 +338,13 @@ - g_free (scheme); - #endif - -- escaped = g_uri_escape_string (uri, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE); -- file = g_file_new_for_uri (escaped); -+ file = g_file_new_for_uri (uri); - scheme = g_file_get_uri_scheme (file); - - /* try to launch common schemes for know preferred applications */ - if (scheme != NULL && exo_open_uri_known_category (uri, scheme, &retval)) - { - g_free (scheme); -- g_free (escaped); - return retval; - } - -@@ -356,7 +361,7 @@ - g_debug ("file is directory, use filemanager"); - #endif - /* directories should go fine with a file manager */ -- retval = exo_open_launch_category ("FileManager", escaped); -+ retval = exo_open_launch_category ("FileManager", uri); - succeed = TRUE; - } - else -@@ -382,7 +387,7 @@ - if (executable == NULL - || strcmp (executable, "exo-open") != 0) - { -- fake_list.data = (gpointer) escaped; -+ fake_list.data = (gpointer) uri; - fake_list.prev = fake_list.next = NULL; - - /* launch it */ -@@ -410,7 +415,7 @@ - /* found scheme, open in file manager */ - if (strcmp (scheme, schemes[i]) == 0) - { -- retval = succeed = exo_open_launch_category ("FileManager", escaped); -+ retval = succeed = exo_open_launch_category ("FileManager", uri); - break; - } - } -@@ -429,13 +434,12 @@ - /* try ftp uris if the file manager/gio failed to recognize it */ - if (scheme != NULL - && (strcmp (scheme, "ftp") == 0 || strcmp (scheme, "ftps") == 0)) -- retval = exo_open_launch_category ("WebBrowser", escaped); -+ retval = exo_open_launch_category ("WebBrowser", uri); - else -- retval = gtk_show_uri (NULL, escaped, 0, error); -+ retval = gtk_show_uri (NULL, uri, 0, error); - } - - g_free (scheme); -- g_free (escaped); - - if (!retval && error != NULL) - *error = err; diff --git a/exo.spec b/exo.spec index 09f3a69..b9d2e48 100644 --- a/exo.spec +++ b/exo.spec @@ -1,12 +1,12 @@ %if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif -%global minorversion 0.10 +%global minorversion 0.12 %global xfceversion 4.12 Name: exo -Version: 0.10.7 -Release: 8%{?dist} +Version: 0.12.0 +Release: 1%{?dist} Summary: Application library for the Xfce desktop environment Group: System Environment/Libraries @@ -25,10 +25,6 @@ Source3: mailtoparse.py Patch1: exo-0.7.2-remove-xfce-category.patch # Set default applications to the ones we use in Fedora Patch2: exo-0.10.2-default-apps.patch -# Escape file uris correctly. -# https://bugzilla.xfce.org/show_bug.cgi?id=12017 -# https://bugzilla.redhat.com/show_bug.cgi?id=1246383 -## Patch3: exo-0.10.6-escaped-uri.patch BuildRequires: gtk-doc BuildRequires: gettext @@ -73,15 +69,13 @@ Python libraries and header files for the exo library. %patch1 -p1 %patch2 -p1 -## %patch3 -p1 %build %configure --enable-gtk-doc --disable-static -make %{?_smp_mflags} V=1 +%make_build %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL='install -p' +%make_install # fix permissions for installed libraries chmod 755 $RPM_BUILD_ROOT/%{_libdir}/*.so @@ -108,8 +102,6 @@ install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/in rm -f %{buildroot}%{_libdir}/xfce4/exo-1/exo-compose-mail-1 install -Dpm 0755 %{SOURCE3} %{buildroot}%{_libdir}/xfce4/exo-1/exo-compose-mail-1 - - %post /sbin/ldconfig %if 0%{?fc13}%{?fc14} @@ -123,9 +115,6 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun /sbin/ldconfig -%if 0%{?fc13}%{?fc14} - gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules &> /dev/null || : -%endif if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -135,7 +124,6 @@ fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files -f exo-1.lang %doc AUTHORS ChangeLog NEWS README THANKS COPYING %dir %{_sysconfdir}/xdg/xfce4 @@ -145,9 +133,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/exo-preferred-applications %{_libdir}/lib*.so.* %{_libdir}/xfce4/ -%if 0%{?fc13}%{?fc14}%{?el6} - %{_libdir}/gio/modules/libexo-module-*.so -%endif %{_datadir}/xfce4/ %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/*/* @@ -165,12 +150,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) %files -n python-exo -%defattr(-, root, root,-) %{python_sitearch}/exo-*/ %{python_sitearch}/pyexo.* %endif %changelog +* Fri Feb 16 2018 Mukundan Ragavan - 0.12.0-1 +- Update to 0.12.0 +- Spec cleanup + * Wed Feb 07 2018 Fedora Release Engineering - 0.10.7-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 3b36ccf..10012b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -92ca200b8787cdd7494164cbc0ed8200 exo-0.10.7.tar.bz2 +SHA512 (exo-0.12.0.tar.bz2) = 8ec52aba3faa9728bb60e09cf696f772160bfd8357c06015a6d72a2302572e74389f78a20addcf3ac632a3ac84b3ee2f40750483a16e2f7e1cff7de6f7aa2692