From 7dae493f0eac81fffd2260aa00dc39846242d26cc95c984a7b196f6b2b75890c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 6 Dec 2011 18:06:32 +0000 Subject: [PATCH 1/4] Updating link to change in openSUSE:Factory/sushi revision 10.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/sushi?expand=0&rev=3017997fcdb9db04e5fc0b522f798f18 --- sushi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sushi.spec b/sushi.spec index fa0e5dc..06ea421 100644 --- a/sushi.spec +++ b/sushi.spec @@ -20,7 +20,7 @@ Name: sushi Version: 0.2.1 Release: 1 -License: GPLv2+ +License: GPL-2.0+ Summary: Quick Previewer for Nautilus Url: http://www.gnome.org Group: Productivity/File utilities @@ -53,7 +53,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Sushi is a quick previewer for Nautilus, the GNOME desktop file manager. %package -n libsushi-1_0-0 -License: GPLv3 +License: GPL-3.0 Summary: Quick Previewer for Nautilus -- Library Group: System/Libraries # When built with unoconv support, the library will use unoconv to From d794aa6bf436005709a870090fe04df099872443427d95a9cd99399289d15a7e Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 12 Dec 2011 16:01:53 +0000 Subject: [PATCH 2/4] Accepting request 96179 from home:dimstar:branches:GNOME:Factory Push typelib change branch OBS-URL: https://build.opensuse.org/request/show/96179 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/sushi?expand=0&rev=17 --- sushi.changes | 5 +++++ sushi.spec | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/sushi.changes b/sushi.changes index d6386b5..a23640d 100644 --- a/sushi.changes +++ b/sushi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 7 21:02:58 UTC 2011 - dimstar@opensuse.org + +- Split typelib files in own subpackage, typelib-1_0-Sushi-1_0. + ------------------------------------------------------------------- Wed Oct 19 14:10:57 UTC 2011 - vuntz@opensuse.org diff --git a/sushi.spec b/sushi.spec index 06ea421..2a2a442 100644 --- a/sushi.spec +++ b/sushi.spec @@ -63,6 +63,13 @@ Recommends: unoconv %description -n libsushi-1_0-0 Sushi is a quick previewer for Nautilus, the GNOME desktop file manager. +%package -n typelib-1_0-Sushi-1_0 +Summary: Quick Previewer for Nautilus -- Library +Group: System/Libraries + +%description -n typelib-1_0-Sushi-1_0 +Sushi is a quick previewer for Nautilus, the GNOME desktop file manager. + %lang_package %prep %setup -q @@ -95,9 +102,13 @@ rm -rf %{buildroot} %files -n libsushi-1_0-0 %defattr(-,root,root) %{_libdir}/libsushi-1.0.so.* -%{_libdir}/girepository-1.0/Sushi-1.0.typelib # devel files, but we really have no need for a devel subpackage %{_libdir}/libsushi-1.0.so + +%files -n typelib-1_0-Sushi-1_0 +%defattr(-,root,root) +%{_libdir}/girepository-1.0/Sushi-1.0.typelib +# devel files, but we really have no need for a devel subpackage %{_datadir}/gir-1.0/Sushi-1.0.gir %files lang -f %{name}.lang From b1ab0fbd992a5ab454ac39aac53d898646962b9fdd8ca807ae8e8c9e11af7011 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Dec 2011 09:04:19 +0000 Subject: [PATCH 3/4] Accepting request 97052 from home:dimstar:branches:GNOME:Factory Update to 0.3.0 OBS-URL: https://build.opensuse.org/request/show/97052 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/sushi?expand=0&rev=18 --- sushi-0.2.1.tar.bz2 | 3 --- sushi-0.3.0.tar.xz | 3 +++ sushi-quote-unoconv.patch | 48 --------------------------------------- sushi.changes | 12 ++++++++++ sushi.spec | 9 ++++---- 5 files changed, 19 insertions(+), 56 deletions(-) delete mode 100644 sushi-0.2.1.tar.bz2 create mode 100644 sushi-0.3.0.tar.xz delete mode 100644 sushi-quote-unoconv.patch diff --git a/sushi-0.2.1.tar.bz2 b/sushi-0.2.1.tar.bz2 deleted file mode 100644 index 8c230af..0000000 --- a/sushi-0.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f1fa2fd037e965c81d6c48bab1f1afdfec09f43054a291a2828c3ecd36f1983 -size 368778 diff --git a/sushi-0.3.0.tar.xz b/sushi-0.3.0.tar.xz new file mode 100644 index 0000000..4332425 --- /dev/null +++ b/sushi-0.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:befcda1a0896a21a2d2c0a368a90299cd566ab8a0c50112688116cd6d6ab0007 +size 295984 diff --git a/sushi-quote-unoconv.patch b/sushi-quote-unoconv.patch deleted file mode 100644 index a81e7da..0000000 --- a/sushi-quote-unoconv.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit e5c7dbe9e4d258bc1aca0c91335da12e759b8a38 -Author: Vincent Untz -Date: Wed Oct 19 16:09:55 2011 +0200 - - pdf-loader: quote the file path before passing it to unoconv - - This fixes unoconv crashing on files with spaces in their names. - - https://bugzilla.gnome.org/show_bug.cgi?id=662197 - -diff --git a/src/libsushi/sushi-pdf-loader.c b/src/libsushi/sushi-pdf-loader.c -index 9730375..b8f822d 100644 ---- a/src/libsushi/sushi-pdf-loader.c -+++ b/src/libsushi/sushi-pdf-loader.c -@@ -101,7 +101,7 @@ unoconv_child_watch_cb (GPid pid, - static void - load_openoffice (SushiPdfLoader *self) - { -- gchar *doc_path, *pdf_path, *tmp_name, *tmp_path; -+ gchar *doc_path, *pdf_path, *tmp_name, *tmp_path, *quoted_path; - GFile *file; - gboolean res; - gchar *cmd; -@@ -113,7 +113,10 @@ load_openoffice (SushiPdfLoader *self) - - file = g_file_new_for_uri (self->priv->uri); - doc_path = g_file_get_path (file); -+ quoted_path = g_shell_quote (doc_path); -+ - g_object_unref (file); -+ g_free (doc_path); - - tmp_name = g_strdup_printf ("sushi-%d.pdf", getpid ()); - tmp_path = g_build_filename (g_get_user_cache_dir (), "sushi", NULL); -@@ -121,11 +124,11 @@ load_openoffice (SushiPdfLoader *self) - g_build_filename (tmp_path, tmp_name, NULL); - g_mkdir_with_parents (tmp_path, 0700); - -- cmd = g_strdup_printf ("unoconv -f pdf -o %s %s", pdf_path, doc_path); -+ cmd = g_strdup_printf ("unoconv -f pdf -o %s %s", pdf_path, quoted_path); - -- g_free (doc_path); - g_free (tmp_name); - g_free (tmp_path); -+ g_free (quoted_path); - - res = g_shell_parse_argv (cmd, &argc, &argv, &error); - g_free (cmd); diff --git a/sushi.changes b/sushi.changes index a23640d..8493c97 100644 --- a/sushi.changes +++ b/sushi.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Dec 19 12:39:40 UTC 2011 - dimstar@opensuse.org + +- Update to version 0.3.0: + + Quote the file path before passing it to unoconv + + Build with latest clutter-gtk + + Updated translations. +- Drop sushi-quote-unoconv.patch: fixed upstream. +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. + ------------------------------------------------------------------- Wed Dec 7 21:02:58 UTC 2011 - dimstar@opensuse.org diff --git a/sushi.spec b/sushi.spec index 2a2a442..89db619 100644 --- a/sushi.spec +++ b/sushi.spec @@ -18,18 +18,18 @@ Name: sushi -Version: 0.2.1 +Version: 0.3.0 Release: 1 License: GPL-2.0+ Summary: Quick Previewer for Nautilus Url: http://www.gnome.org Group: Productivity/File utilities -Source0: http://download.gnome.org/sources/sushi/0.2/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM sushi-quote-unoconv.patch bgo#662197 vuntz@opensuse.org -- quote the file path before passing it to unoconv -Patch0: sushi-quote-unoconv.patch +Source0: http://download.gnome.org/sources/sushi/0.3/%{name}-%{version}.tar.xz BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: unoconv +# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +BuildRequires: xz BuildRequires: pkgconfig(clutter-1.0) BuildRequires: pkgconfig(clutter-gst-1.0) BuildRequires: pkgconfig(clutter-gtk-1.0) @@ -73,7 +73,6 @@ Sushi is a quick previewer for Nautilus, the GNOME desktop file manager. %lang_package %prep %setup -q -%patch0 -p1 %build %configure From 4c535e714857f9de5113ba4eb202b111a83efafeed3868e306d35906735fe274 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Dec 2011 09:07:09 +0000 Subject: [PATCH 4/4] Accepting request 97487 from home:vuntz:branches:GNOME:Factory tweak OBS-URL: https://build.opensuse.org/request/show/97487 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/sushi?expand=0&rev=19 --- sushi.changes | 2 +- sushi.spec | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sushi.changes b/sushi.changes index 8493c97..cba97fd 100644 --- a/sushi.changes +++ b/sushi.changes @@ -13,7 +13,7 @@ Mon Dec 19 12:39:40 UTC 2011 - dimstar@opensuse.org ------------------------------------------------------------------- Wed Dec 7 21:02:58 UTC 2011 - dimstar@opensuse.org -- Split typelib files in own subpackage, typelib-1_0-Sushi-1_0. +- Split typelib files into typelib-1_0-Sushi-1_0 subpackage. ------------------------------------------------------------------- Wed Oct 19 14:10:57 UTC 2011 - vuntz@opensuse.org diff --git a/sushi.spec b/sushi.spec index 89db619..e600141 100644 --- a/sushi.spec +++ b/sushi.spec @@ -15,15 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: sushi Version: 0.3.0 -Release: 1 -License: GPL-2.0+ +Release: 0 Summary: Quick Previewer for Nautilus -Url: http://www.gnome.org +License: GPL-2.0+ Group: Productivity/File utilities +Url: http://www.gnome.org Source0: http://download.gnome.org/sources/sushi/0.3/%{name}-%{version}.tar.xz BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -53,8 +51,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Sushi is a quick previewer for Nautilus, the GNOME desktop file manager. %package -n libsushi-1_0-0 -License: GPL-3.0 Summary: Quick Previewer for Nautilus -- Library +License: GPL-3.0 Group: System/Libraries # When built with unoconv support, the library will use unoconv to # read LibreOffice files @@ -64,12 +62,15 @@ Recommends: unoconv Sushi is a quick previewer for Nautilus, the GNOME desktop file manager. %package -n typelib-1_0-Sushi-1_0 -Summary: Quick Previewer for Nautilus -- Library +Summary: Quick Previewer for Nautilus -- Introspection bindings +License: GPL-2.0+ Group: System/Libraries %description -n typelib-1_0-Sushi-1_0 Sushi is a quick previewer for Nautilus, the GNOME desktop file manager. +This package provides the GObject Introspection bindings for libsushi. + %lang_package %prep %setup -q