From aaba17f90ca1bf9f597887524d3795bf1dd0f7cb Mon Sep 17 00:00:00 2001
From: Dan Fruehauf <malkodan@gmail.com>
Date: Nov 03 2013 03:58:53 +0000
Subject: Update to 3.4.2 final (fixes bugs 340, 346, 347, 356, 360, and 362).


---

diff --git a/.gitignore b/.gitignore
index d03b95c..4ebb94b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /audacious-3.4-beta2.tar.bz2
 /audacious-3.4.tar.bz2
 /audacious-3.4.1.tar.bz2
+/audacious-3.4.2.tar.bz2
diff --git a/audacious-3.4.1-probe-offset.patch b/audacious-3.4.1-probe-offset.patch
deleted file mode 100644
index e2d8ce7..0000000
--- a/audacious-3.4.1-probe-offset.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nurb --strip-trailing-cr /tmp/tmp.wSmywm8qEy/audacious-3.4.x-old/src/audacious/probe-buffer.c audacious-3.4.x/src/audacious/probe-buffer.c
---- /tmp/tmp.wSmywm8qEy/audacious-3.4.x-old/src/audacious/probe-buffer.c	2013-08-14 11:13:03.000000000 +0200
-+++ audacious-3.4.x/src/audacious/probe-buffer.c	2013-09-09 11:13:03.193756855 +0200
-@@ -89,7 +89,7 @@
-     if (whence == SEEK_CUR)
-         offset += p->at;
- 
--    if (offset < 0)
-+    if (offset < 0 || offset > sizeof p->buffer)
-         return -1;
- 
-     increase_buffer (p, offset);
-diff -Nurb --strip-trailing-cr /tmp/tmp.wSmywm8qEy/audacious-3.4.x-old/src/audacious/probe.c audacious-3.4.x/src/audacious/probe.c
---- /tmp/tmp.wSmywm8qEy/audacious-3.4.x-old/src/audacious/probe.c	2013-07-22 17:22:36.000000000 +0200
-+++ audacious-3.4.x/src/audacious/probe.c	2013-09-09 11:13:03.193756855 +0200
-@@ -188,6 +188,11 @@
-     if (state.handle != NULL)
-         vfs_fclose (state.handle);
- 
-+    if (state.plugin != NULL)
-+        AUDDBG ("Probe succeeded: %s\n", plugin_get_name (state.plugin));
-+    else
-+        AUDDBG ("Probe failed.\n");
-+
-     return state.plugin;
- }
- 
-
diff --git a/audacious.spec b/audacious.spec
index 9ec8dcb..476d2f5 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -1,14 +1,14 @@
 # Minimum audacious/audacious-plugins version in inter-package dependencies.
-%global aud_ver 3.4.1
+%global aud_ver 3.4.2
 
-%global tar_ver 3.4.1
+%global tar_ver 3.4.2
 
 # Audacious Generic Plugin API defined in audacious-libs subpackage.
 
 
 Name: audacious
-Version: 3.4.1
-Release: 2%{?dist}
+Version: 3.4.2
+Release: 1%{?dist}
 
 License: BSD
 Summary: Advanced audio player
@@ -17,9 +17,6 @@ Group: Applications/Multimedia
 
 Source0: http://distfiles.audacious-media-player.org/audacious-%{tar_ver}.tar.bz2
 
-# fixed post-3.4.1 / closed #340
-Patch0: audacious-3.4.1-probe-offset.patch
-
 BuildRequires: gettext
 BuildRequires: gtk3-devel
 BuildRequires: libguess-devel
@@ -100,7 +97,6 @@ generated documentation for developers.
 
 %prep
 %setup -q -n %{name}-%{tar_ver}
-%patch0 -p1 -b .probe-offset
 
 # Verify the value of the audacious(plugin-api) Provides.
 api=$(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\+' src/audacious/plugin.h | sed 's!.*_AUD_PLUGIN_VERSION[ ]*\([0-9]\+\).*!\1!')
@@ -176,11 +172,14 @@ fi
 %doc doc/html/
 
 %changelog
+* Sun Nov  3 2013 Dan Fruehauf <malkodan@gmail.com> - 3.4.2-1
+- Update to 3.4.2 final (fixes bugs 340, 346, 347, 356, 360, and 362).
+
 * Fri Sep 13 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 3.4.1-2
 - Merge fix for upstream bug 340: When probing file content, immediately
   reject out-of-bounds seek requests.
 
-* Mon Sep 09 2013 Dan Fruehauf <malkodan@gmail.com> - 3.4.1-1
+* Mon Sep  9 2013 Dan Fruehauf <malkodan@gmail.com> - 3.4.1-1
 - Update to 3.4.1 final (a few bug fixes).
 
 * Sat Aug 31 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 3.4-4
diff --git a/sources b/sources
index 2168b1d..317c83e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7f00c2b7d50f2da42be457efe2c376d  audacious-3.4.1.tar.bz2
+b5ee7a825b1cc1a5348875e6274cfc4e  audacious-3.4.2.tar.bz2