[audacious-plugins] Update to 3.2-beta1.

[Michael Schwendt]

commit bb2565ed314b6c6cb92a2806d9b86f5a69321a31
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Mon Jan 2 03:05:43 2012 +0100

    Update to 3.2-beta1.

 .gitignore                                         |    1 +
 ...ious-plugins-3.2-alpha1-gmodule-pkgconfig.patch |   18 ------------------
 ...cious-plugins-3.2-beta1-gmodule-pkgconfig.patch |   18 ++++++++++++++++++
 audacious-plugins.spec                             |   20 ++++++++------------
 sources                                            |    2 +-
 5 files changed, 28 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3761481..18f6c23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /audacious-plugins-3.1-fedora.tar.xz
 /audacious-plugins-3.1.1-fedora.tar.xz
 /audacious-plugins-3.2-alpha1-fedora.tar.xz
+/audacious-plugins-3.2-beta1.tar.bz2
diff --git a/audacious-plugins-3.2-beta1-gmodule-pkgconfig.patch b/audacious-plugins-3.2-beta1-gmodule-pkgconfig.patch
new file mode 100644
index 0000000..c7bb888
--- /dev/null
+++ b/audacious-plugins-3.2-beta1-gmodule-pkgconfig.patch
@@ -0,0 +1,18 @@
+diff -Nurb --strip-trailing-cr audacious-plugins-3.2-beta1-orig/src/amidi-plug/Makefile audacious-plugins-3.2-beta1/src/amidi-plug/Makefile
+--- audacious-plugins-3.2-beta1-orig/src/amidi-plug/Makefile	2011-12-30 00:21:49.000000000 +0100
++++ audacious-plugins-3.2-beta1/src/amidi-plug/Makefile	2012-01-02 02:54:53.646129222 +0100
+@@ -21,4 +21,4 @@
+ CFLAGS += ${PLUGIN_CFLAGS}
+ CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${GMODULE_CFLAGS} \
+ 	-DAMIDIPLUGBACKENDDIR=\"${plugindir}/${AMIDIPLUG_BACKEND_DIR}\" ${PTHREAD_CFLAGS} -I../..
+-LIBS += ${GTK_LIBS} ${PANGO_LIBS} ${GMODULE_LIBS} ${PTHREAD_LIBS} ./pcfg/libpcfg.a ${GLIB_LIBS}
++LIBS += ${GTK_LIBS} ${PANGO_LIBS} ${GMODULE_LIBS} ${PTHREAD_LIBS} ./pcfg/libpcfg.a ${GLIB_LIBS} `pkg-config --libs gmodule-2.0`
+diff -Nurb --strip-trailing-cr audacious-plugins-3.2-beta1-orig/src/ladspa/Makefile audacious-plugins-3.2-beta1/src/ladspa/Makefile
+--- audacious-plugins-3.2-beta1-orig/src/ladspa/Makefile	2011-12-30 00:21:49.000000000 +0100
++++ audacious-plugins-3.2-beta1/src/ladspa/Makefile	2012-01-02 02:56:17.904557465 +0100
+@@ -12,4 +12,4 @@
+ 
+ CPPFLAGS += -I../.. ${PTHREAD_CFLAGS} ${GTK_CFLAGS}
+ CFLAGS += ${PLUGIN_CFLAGS}
+-LIBS += -lm ${PTHREAD_LIBS} ${GTK_LIBS}
++LIBS += -lm ${PTHREAD_LIBS} ${GTK_LIBS} `pkg-config --libs gmodule-2.0`
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index fad5f3c..d45f389 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -4,14 +4,14 @@
 %endif
 %{?aud_plugin_dep}
 
-%global tar_ver %{version}-alpha1
+%global tar_ver %{version}-beta1
 
 # Minimum audacious/audacious-plugins version in inter-package dependencies.
 %global aud_ver 3.2
 
 Name: audacious-plugins
 Version: 3.2
-Release: 0.1.alpha1%{?dist}
+Release: 0.2.beta1%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -21,8 +21,7 @@ URL: http://audacious-media-player.org/
 # BSD: alsa, compressor, crossfade, psf, resample, unix-io, xsf
 License: GPLv2 and GPLv2+ and LGPLv2+ and MIT and GPLv3
 
-Source0: audacious-plugins-%{tar_ver}-fedora.tar.xz
-#Source0: http://distfiles.atheme.org/audacious-plugins-%{tar_ver}.tar.bz2
+Source0: http://distfiles.atheme.org/audacious-plugins-%{tar_ver}.tar.bz2
 Source1: audacious-sid.desktop
 Source2: audacious-amidi.desktop
 
@@ -33,7 +32,7 @@ Patch1: audacious-plugins-3.0-alpha1-enable-gnomeshortcuts.patch
 # Fedora customization: add default system-wide module_path
 Patch2: audacious-plugins-3.1-beta1-ladspa.patch
 # missing gmodule-2.0.pc libs
-Patch3: audacious-plugins-3.2-alpha1-gmodule-pkgconfig.patch
+Patch3: audacious-plugins-3.2-beta1-gmodule-pkgconfig.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext-devel
@@ -91,12 +90,6 @@ Summary: Optional niche market plugins for Audacious
 Group: Applications/Multimedia
 %{?aud_plugin_dep}
 Requires: audacious-plugins%{?_isa} >= %{aud_ver}
-# temporarily only:
-%if 0%{?fedora} > 14
-# subpkg was available during F-15 development
-Obsoletes: audacious-plugins-adplug < %{version}-%{release}
-Provides: audacious-plugins-adplug = %{version}-%{release}
-%endif
 
 %description exotic
 This package provides optional plugins for Audacious, which do not aim
@@ -137,7 +130,7 @@ providers may build it with libsidplay 2 instead.
 
 
 %prep
-%setup -q -n %{name}-%{tar_ver}-fedora
+%setup -q -n %{name}-%{tar_ver}
 %patch0 -p1 -b .xmms-skindir
 %patch1 -p1 -b .enable-gnomeshortcuts
 %patch2 -p1 -b .ladspa
@@ -246,6 +239,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Mon Jan  2 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 3.2-0.2.beta1
+- Update to 3.2-beta1.
+
 * Fri Dec 23 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 3.2-0.1.alpha1
 - Explicitly link with gmodule-2.0.pc libs for missing libs.
 - Upgrade to 3.2-alpha1.
diff --git a/sources b/sources
index 93aed63..ee630d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-544368d355551558f23cfdea3eeee83d  audacious-plugins-3.2-alpha1-fedora.tar.xz
+68836dedfdd55a5458b38c46db5b947d  audacious-plugins-3.2-beta1.tar.bz2