From c9cc73b2135f0a80b0c2cb00414023c674ab5598 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: May 19 2011 20:34:45 +0000
Subject: Update to 2.5.1.

No longer --disable-sse2 for %ix86 since this option has been dropped.

---

diff --git a/.gitignore b/.gitignore
index fdd3867..93f9751 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,3 @@
-audacious-plugins-fedora-2.4-beta1.tar.bz2
-audacious-plugins-fedora-2.4-beta2.tar.bz2
-audacious-plugins-fedora-2.4-rc1.tar.bz2
-/audacious-plugins-fedora-2.4-rc2.tar.bz2
-/audacious-plugins-fedora-2.4.0.tar.bz2
-/audacious-plugins-fedora-2.4.2.tar.bz2
-/audacious-plugins-fedora-2.4.3.tar.bz2
-/audacious-plugins-fedora-2.4.4.tar.bz2
-/audacious-plugins-fedora-2.5-alpha2.tar.bz2
-/audacious-plugins-fedora-2.5-beta1.tar.bz2
-/audacious-plugins-fedora-2.5-beta2.tar.bz2
+/audacious-plugins-fedora-2.4.5.tar.bz2
 /audacious-plugins-fedora-2.5.0.tar.bz2
+/audacious-plugins-fedora-2.5.1.tar.bz2
diff --git a/audacious-plugins-2.4.5-m3u.patch b/audacious-plugins-2.4.5-m3u.patch
deleted file mode 100644
index da376fc..0000000
--- a/audacious-plugins-2.4.5-m3u.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur audacious-plugins-fedora-2.4.5-orig/src/m3u/m3u.c audacious-plugins-fedora-2.4.5/src/m3u/m3u.c
---- audacious-plugins-fedora-2.4.5-orig/src/m3u/m3u.c	2011-04-17 15:29:25.000000000 +0200
-+++ audacious-plugins-fedora-2.4.5/src/m3u/m3u.c	2011-04-23 10:33:37.536322421 +0200
-@@ -86,7 +86,7 @@
-     gchar * parse = text;
-     struct index * add = index_new ();
- 
--    while (1)
-+    while (parse)
-     {
-         gchar * next = split_line (parse);
- 
diff --git a/audacious-plugins-2.5.0-AUD-331.patch b/audacious-plugins-2.5.0-AUD-331.patch
deleted file mode 100644
index d5a5700..0000000
--- a/audacious-plugins-2.5.0-AUD-331.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur audacious-plugins-fedora-2.5.0-orig/src/skins/ui_main.c audacious-plugins-fedora-2.5.0/src/skins/ui_main.c
---- audacious-plugins-fedora-2.5.0-orig/src/skins/ui_main.c	2011-04-16 18:10:11.000000000 +0200
-+++ audacious-plugins-fedora-2.5.0/src/skins/ui_main.c	2011-04-23 15:39:27.126703715 +0200
-@@ -1124,7 +1124,7 @@
- static gboolean seek_press (GtkWidget * widget, GdkEventButton * event,
-  void * rewind)
- {
--    if (event->button != 1 || seek_source || ! aud_drct_get_playing ())
-+    if (event->button != 1 || seek_source)
-         return FALSE;
- 
-     seek_start = ui_skinned_horizontal_slider_get_position (mainwin_position);
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index cd1c2cc..0970748 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -9,8 +9,8 @@
 Requires: audacious >= %{aud_ver}
 
 Name: audacious-plugins
-Version: 2.5.0
-Release: 3%{?dist}
+Version: 2.5.1
+Release: 1%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -29,10 +29,6 @@ Source2: audacious-amidi.desktop
 Patch0: audacious-plugins-2.5-alpha1-xmms-skindir.patch
 # Fedora customization: fix hardcoded libdir replacement
 Patch1: audacious-plugins-2.4-libdir.patch
-# AUDPLUG-361
-Patch2: audacious-plugins-2.4.5-m3u.patch
-# fixed post 2.5.0, AUD-331
-Patch3: audacious-plugins-2.5.0-AUD-331.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext
@@ -162,8 +158,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
-%patch2 -p1 -b .m3u-crash
-%patch3 -p1 -b .AUD-331
 
 for i in src/ladspa/ladspa.c
 do
@@ -186,9 +180,6 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
 %if 0%{?fedora} < 14
     --disable-projectm-1.0  \
 %endif
-%ifarch %{ix86}
-    --disable-sse2  \
-%endif
     --disable-rpath  \
     --disable-dependency-tracking
 make %{?_smp_mflags}
@@ -281,6 +272,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Thu May 19 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 2.5.1-1
+- Update to 2.5.1.
+- No longer --disable-sse2 for %%ix86 since this option has been dropped.
+
 * Sat Apr 23 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 2.5.0-3
 - Merge fix for skinned ui track next/prev (AUD-331).
 - Fix missing newline NULL-ptr crash in m3u loader (#699107).
diff --git a/sources b/sources
index 3070554..ed8aaa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-188453db2f2fe88441b7a00066347354  audacious-plugins-fedora-2.5.0.tar.bz2
+99a8d3185cb53ee45ec092a6dca49e01  audacious-plugins-fedora-2.5.1.tar.bz2