Accepting request 99128 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/99128
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sushi?expand=0&rev=11

sushi-0.2.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f1fa2fd037e965c81d6c48bab1f1afdfec09f43054a291a2828c3ecd36f1983
-size 368778

sushi-0.3.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:befcda1a0896a21a2d2c0a368a90299cd566ab8a0c50112688116cd6d6ab0007
+size 295984

sushi-quote-unoconv.patch

@@ -1,48 +0,0 @@
-commit e5c7dbe9e4d258bc1aca0c91335da12e759b8a38
-Author: Vincent Untz <vuntz@gnome.org>
-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);

sushi.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+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
+
+- Split typelib files into typelib-1_0-Sushi-1_0 subpackage.
+
 -------------------------------------------------------------------
 Wed Oct 19 14:10:57 UTC 2011 - vuntz@opensuse.org
 

sushi.spec

@@ -15,21 +15,19 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           sushi
-Version:        0.2.1
+Version:        0.3.0
-Release:        1
+Release:        0
-License:        GPL-2.0+
 Summary:        Quick Previewer for Nautilus
-Url:            http://www.gnome.org
+License:        GPL-2.0+
 Group:          Productivity/File utilities
-Source0:        http://download.gnome.org/sources/sushi/0.2/%{name}-%{version}.tar.bz2
+Url:            http://www.gnome.org
-# PATCH-FIX-UPSTREAM sushi-quote-unoconv.patch bgo#662197 vuntz@opensuse.org -- quote the file path before passing it to unoconv
+Source0:        http://download.gnome.org/sources/sushi/0.3/%{name}-%{version}.tar.xz
-Patch0:         sushi-quote-unoconv.patch
 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)
@@ -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
@@ -63,10 +61,19 @@ 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 -- 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
-%patch0 -p1
 
 %build
 %configure
@@ -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