[audacious-plugins] LADSPA plugin supports LADSPA_PATH environment variable again. Rocklight plugin not built anymore, a

[Michael Schwendt]

commit e7964e57ca04bb196ddbc80bb6cd9a8fe045659a
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Tue Oct 11 13:48:50 2011 +0200

    LADSPA plugin supports LADSPA_PATH environment variable again.
    Rocklight plugin not built anymore, and build-switch has been removed.
    Update to 3.1-beta1.

 .gitignore                                |    1 +
 audacious-plugins-3.1-alpha1-libdir.patch |   12 ------------
 audacious-plugins-3.1-beta1-ladspa.patch  |   11 +++++++++++
 audacious-plugins.spec                    |   21 ++++++++++++++-------
 sources                                   |    2 +-
 5 files changed, 27 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 045d363..7eb4d85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /audacious-plugins-fedora-3.0.2.tar.bz2
 /audacious-plugins-fedora-3.0.3.tar.xz
 /audacious-plugins-fedora-3.1-alpha1.tar.xz
+/audacious-plugins-3.1-beta1-fedora.tar.xz
diff --git a/audacious-plugins-3.1-beta1-ladspa.patch b/audacious-plugins-3.1-beta1-ladspa.patch
new file mode 100644
index 0000000..c5aa844
--- /dev/null
+++ b/audacious-plugins-3.1-beta1-ladspa.patch
@@ -0,0 +1,11 @@
+diff -Nur audacious-plugins-3.1-beta1-orig/src/ladspa/plugin.c audacious-plugins-3.1-beta1/src/ladspa/plugin.c
+--- audacious-plugins-3.1-beta1-orig/src/ladspa/plugin.c	2011-10-10 23:02:59.000000000 +0200
++++ audacious-plugins-3.1-beta1/src/ladspa/plugin.c	2011-10-11 13:09:44.075163133 +0200
+@@ -35,6 +35,7 @@
+ #include "plugin.h"
+ 
+ static const gchar * const ladspa_defaults[] = {
++ "module_path", "__RPM_LIBDIR__/ladspa",
+  "plugin_count", "0",
+  NULL};
+ 
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index c1baaa3..dcd3004 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -4,12 +4,14 @@
 %endif
 %{?aud_plugin_dep}
 
+%global tar_ver %{version}-beta1
+
 # Minimum audacious/audacious-plugins version in inter-package dependencies.
 %global aud_ver 3.1
 
 Name: audacious-plugins
 Version: 3.1
-Release: 0.1.alpha1%{?dist}
+Release: 0.1.beta1%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -19,8 +21,8 @@ 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-fedora-%{version}-alpha1.tar.xz
-#Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
+Source0: audacious-plugins-%{tar_ver}-fedora.tar.xz
+#Source0: http://distfiles.atheme.org/audacious-plugins-%{tar_ver}.tar.bz2
 Source1: audacious-sid.desktop
 Source2: audacious-amidi.desktop
 
@@ -28,8 +30,8 @@ Source2: audacious-amidi.desktop
 Patch0: audacious-plugins-3.0-alpha1-xmms-skindir.patch
 # Fedora customization (RFE bz #632388)
 Patch1: audacious-plugins-3.0-alpha1-enable-gnomeshortcuts.patch
-# Fedora customization: fix hardcoded libdir replacement
-Patch2: audacious-plugins-3.1-alpha1-libdir.patch
+# Fedora customization: add default system-wide module_path
+Patch2: audacious-plugins-3.1-beta1-ladspa.patch
 
 BuildRequires: autoconf
 BuildRequires: audacious-devel >= %{aud_ver}
@@ -135,10 +137,10 @@ providers may build it with libsidplay 2 instead.
 %prep
 # Enforce availability of the audacious(plugin-api) dependency.
 %{!?aud_plugin_dep:echo 'No audacious(plugin-api) dependency!' && exit -1}
-%setup -q -n %{name}-fedora-%{version}-alpha1
+%setup -q -n %{name}-%{tar_ver}-fedora
 %patch0 -p1 -b .xmms-skindir
 %patch1 -p1 -b .enable-gnomeshortcuts
-%patch2 -p1 -b .libdir
+%patch2 -p1 -b .ladspa
 autoreconf -I m4
 
 for i in src/ladspa/plugin.c
@@ -246,6 +248,11 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Tue Oct 11 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 3.1-0.1.beta1
+- LADSPA plugin supports LADSPA_PATH environment variable again.
+- Rocklight plugin not built anymore, and build-switch has been removed.
+- Update to 3.1-beta1.
+
 * Wed Sep 21 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 3.1-0.1.alpha1
 - LADSPA plugin has returned, but is missing support for multiple search
   paths for modules (AUDPLUG-403).
diff --git a/sources b/sources
index c753eb2..700adaa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-180a7f3dcc4c985f04df7facce9e5dff  audacious-plugins-fedora-3.1-alpha1.tar.xz
+a4b31ee1ada5359ee228f0d8630c1c2c  audacious-plugins-3.1-beta1-fedora.tar.xz