From 2ce9521e1652ee9f531a8660e1893b16ebdb28f9e8f8d2c907b8eb8c8951f069 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Fri, 8 Jul 2011 09:18:21 +0000
Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/sushi
 revision 2.0

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/sushi?expand=0&rev=79a09765441b410690d1e96d43bff2ea

From 35db0a27d84a60d51e3e1fbb0ff68e5c216e0d43832177d68c49ca82d16d9ff8 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Sat, 9 Jul 2011 19:03:17 +0000
Subject: [PATCH 2/2] Accepting request 75948 from
 home:vuntz:branches:GNOME:Factory

Update to 0.0.4

OBS-URL: https://build.opensuse.org/request/show/75948
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/sushi?expand=0&rev=3
---
 sushi-0.0.3.tar.bz2      |  3 ---
 sushi-0.0.4.tar.bz2      |  3 +++
 sushi-fix-warnings.patch | 32 --------------------------------
 sushi.changes            | 10 ++++++++++
 sushi.spec               |  9 +++------
 5 files changed, 16 insertions(+), 41 deletions(-)
 delete mode 100644 sushi-0.0.3.tar.bz2
 create mode 100644 sushi-0.0.4.tar.bz2
 delete mode 100644 sushi-fix-warnings.patch

diff --git a/sushi-0.0.3.tar.bz2 b/sushi-0.0.3.tar.bz2
deleted file mode 100644
index 9e83a3e..0000000
--- a/sushi-0.0.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62b5538c2d299e660fa721a46816313f6a581792d97bbf61f51e1997c1d78d70
-size 363557
diff --git a/sushi-0.0.4.tar.bz2 b/sushi-0.0.4.tar.bz2
new file mode 100644
index 0000000..8bbd276
--- /dev/null
+++ b/sushi-0.0.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a31debc573c344781055b66e118f2be8f89c05dade9bbbf717b2bff9ef7c8c29
+size 359320
diff --git a/sushi-fix-warnings.patch b/sushi-fix-warnings.patch
deleted file mode 100644
index da19d22..0000000
--- a/sushi-fix-warnings.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/libsushi/sushi-sound-player.c b/src/libsushi/sushi-sound-player.c
-index d275ac8..6406cee 100644
---- a/src/libsushi/sushi-sound-player.c
-+++ b/src/libsushi/sushi-sound-player.c
-@@ -131,6 +131,8 @@ sushi_sound_player_ensure_discoverer (SushiSoundPlayer *player)
-                     G_CALLBACK (discoverer_discovered_cb), player);
-   gst_discoverer_start (priv->discoverer);
-   gst_discoverer_discover_uri_async (priv->discoverer, priv->uri);
-+
-+  return TRUE;
- }
- 
- static void
-@@ -143,8 +145,7 @@ sushi_sound_player_set_uri (SushiSoundPlayer *player,
- 
-   priv = SUSHI_SOUND_PLAYER_GET_PRIVATE (player);
- 
--  if (priv->uri &&
--      !strcmp (priv->uri, uri))
-+  if (!g_strcmp0 (priv->uri, uri))
-     return;
- 
-   g_free (priv->uri);
-@@ -588,7 +589,7 @@ sushi_sound_player_get_playing (SushiSoundPlayer *player)
-   GstState state, pending;
-   gboolean playing;
- 
--  g_return_if_fail (SUSHI_IS_SOUND_PLAYER (player));
-+  g_return_val_if_fail (SUSHI_IS_SOUND_PLAYER (player), FALSE);
- 
-   priv = SUSHI_SOUND_PLAYER_GET_PRIVATE (player);
- 
diff --git a/sushi.changes b/sushi.changes
index b5c0a50..f2f4ea3 100644
--- a/sushi.changes
+++ b/sushi.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Jul  9 14:30:38 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 0.0.4:
+  + Relicense to GPLv2 with an exception clause to allow use
+    non-free GStreamer plugins.
+  + Fix some compilation warnings.
+- Drop sushi-fix-warnings.patch: fixed upstream.
+- Change license tag from GPLv3 to GPLv2+.
+
 -------------------------------------------------------------------
 Sun Jul  3 18:11:14 CEST 2011 - vuntz@opensuse.org
 
diff --git a/sushi.spec b/sushi.spec
index d7a997e..1913783 100644
--- a/sushi.spec
+++ b/sushi.spec
@@ -18,15 +18,13 @@
 
 
 Name:           sushi
-Version:        0.0.3
+Version:        0.0.4
 Release:        1
-License:        GPLv3
+License:        GPLv2+
 Summary:        Quick Previewer for Nautilus
 Url:            http://www.gnome.org
 Group:          Productivity/File utilities
-Source0:        http://download.gnome.org/sources/sushi/0.3/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM sushi-fix-warnings.patch vuntz@opensuse.org -- Fix build warnings breaking the build; sent upstream by mail
-Patch0:         sushi-fix-warnings.patch
+Source0:        http://download.gnome.org/sources/sushi/0.0/%{name}-%{version}.tar.bz2
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
 BuildRequires:  unoconv
@@ -66,7 +64,6 @@ Sushi is a quick previewer for Nautilus, the GNOME desktop file manager.
 %lang_package
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure