[audacious-plugins/f15] Update to 2.5.4 (merged patches, minor fixes, 8k diff).

[Michael Schwendt]

commit 4b52d70f7cac07d50608ac4f8b887c41939de055
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Jul 15 12:14:40 2011 +0200

    Update to 2.5.4 (merged patches, minor fixes, 8k diff).

 .gitignore                                         |    1 +
 ... => audacious-plugins-2.5.4-streambrowser.patch |   23 +++++--------------
 audacious-plugins.spec                             |   12 +++++-----
 sources                                            |    2 +-
 4 files changed, 14 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f6ccc67..dcf00d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /audacious-plugins-fedora-2.5.1.tar.bz2
 /audacious-plugins-fedora-2.5.2.tar.bz2
 /audacious-plugins-fedora-2.5.3.tar.bz2
+/audacious-plugins-fedora-2.5.4.tar.bz2
diff --git a/audacious-plugins-2.5.3-streambrowser.patch b/audacious-plugins-2.5.4-streambrowser.patch
similarity index 63%
rename from audacious-plugins-2.5.3-streambrowser.patch
rename to audacious-plugins-2.5.4-streambrowser.patch
index df9714f..05d7970 100644
--- a/audacious-plugins-2.5.3-streambrowser.patch
+++ b/audacious-plugins-2.5.4-streambrowser.patch
@@ -1,18 +1,7 @@
-diff -Nurb audacious-plugins-2.5.3-orig/src/streambrowser/streambrowser.c audacious-plugins-2.5.3/src/streambrowser/streambrowser.c
---- audacious-plugins-2.5.3-orig/src/streambrowser/streambrowser.c	2011-06-30 00:06:11.000000000 +0200
-+++ audacious-plugins-2.5.3/src/streambrowser/streambrowser.c	2011-07-13 12:25:46.000000000 +0200
-@@ -323,8 +323,9 @@
- 
- static gboolean sb_init (void)
- {
--    /* Preload http:// transport for access from secondary thread */
-+    /* Preload transports for access from secondary thread */
-     vfs_prepare ("http");
-+    vfs_prepare ("file");
- 
-     AUDDBG("sb_init()\n");
-     config_load ();
-@@ -368,7 +369,9 @@
+diff -Nurb audacious-plugins-2.5.4-orig/src/streambrowser/streambrowser.c audacious-plugins-2.5.4/src/streambrowser/streambrowser.c
+--- audacious-plugins-2.5.4-orig/src/streambrowser/streambrowser.c	2011-07-15 01:00:39.000000000 +0200
++++ audacious-plugins-2.5.4/src/streambrowser/streambrowser.c	2011-07-15 12:09:57.440570079 +0200
+@@ -369,7 +369,9 @@
      streambrowser_win_set_update_function (streamdir_update);
  
      /* others */
@@ -22,7 +11,7 @@ diff -Nurb audacious-plugins-2.5.3-orig/src/streambrowser/streambrowser.c audaci
      update_thread_data_queue = g_queue_new ();
  
      AUDDBG("gui initialized\n");
-@@ -378,14 +381,6 @@
+@@ -379,14 +381,6 @@
  
  static void gui_done ()
  {
@@ -37,7 +26,7 @@ diff -Nurb audacious-plugins-2.5.3-orig/src/streambrowser/streambrowser.c audaci
      AUDDBG("gui destroyed\n");
  }
  
-@@ -642,15 +637,7 @@
+@@ -643,15 +637,7 @@
          /* update all streamdirs */
          else
          {
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index e4c3f41..a29523f 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -9,8 +9,8 @@
 Requires: audacious >= %{aud_ver}
 
 Name: audacious-plugins
-Version: 2.5.3
-Release: 2%{?dist}
+Version: 2.5.4
+Release: 1%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -29,10 +29,8 @@ Source2: audacious-amidi.desktop
 Patch0: audacious-plugins-2.5.2-xmms-skindir.patch
 # Fedora customization: fix hardcoded libdir replacement
 Patch1: audacious-plugins-2.4-libdir.patch
-# fixed upstream AUDPLUG-380
-Patch3: audacious-plugins-2.5.2-m3u-eof.patch
 #
-Patch4: audacious-plugins-2.5.3-streambrowser.patch
+Patch4: audacious-plugins-2.5.4-streambrowser.patch
 #
 Patch5: audacious-plugins-2.5.3-moodbar.patch
 
@@ -159,7 +157,6 @@ providers may build it with libsidplay 2 instead.
 %setup -q -n audacious-plugins-fedora-%{version}
 %patch0 -p1 -b .xmms-skindir
 %patch1 -p1 -b .libdir
-%patch3 -p1 -b .m3u-eof
 %patch4 -p1 -b .streambrowser
 %patch5 -p1 -b .moodbar
 
@@ -276,6 +273,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Fri Jul 15 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.4-1
+- Update to 2.5.4 (merged patches, minor fixes, 8k diff).
+
 * Wed Jul 13 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.3-2
 - Fix several issues and crashes in the moodbar plugin.
 - Fix file transport in the streambrowser plugin.
diff --git a/sources b/sources
index b2ee243..f8d698e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a5ad387d56f9c5709fd7d0f6a2dfb7c  audacious-plugins-fedora-2.5.3.tar.bz2
+f34bfb73bda14d57abb5ae8fddab3ba0  audacious-plugins-fedora-2.5.4.tar.bz2