[audacious] Build with GTK+ 3. Generic plugin API/ABI minimum version bumped to 30. Upgrade to 3.0-alpha1.

[Michael Schwendt]

commit 2ec7c5e2335107dfa50a8f2274de10ad9a57096b
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Tue Jun 14 16:57:27 2011 +0200

    Build with GTK+ 3.
    Generic plugin API/ABI minimum version bumped to 30.
    Upgrade to 3.0-alpha1.

 .gitignore                                  |    1 +
 audacious-2.4.0-enable-gnomeshortcuts.patch |   15 -----------
 audacious.spec                              |   36 ++++++++++++++------------
 sources                                     |    2 +-
 4 files changed, 21 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f2cb10b..b76e043 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /audacious-2.4.5.tgz
 /audacious-2.5.0.tgz
 /audacious-2.5.1.tgz
+/audacious-3.0-alpha1.tgz
diff --git a/audacious.spec b/audacious.spec
index ce4ef8d..5061bfc 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -1,36 +1,31 @@
 # Minimum audacious/audacious-plugins version in inter-package dependencies.
-# We enforce 2.5 as 2.4.3 and older are insufficient.
-%global aud_ver 2.5.0
+%global aud_ver 3.0
 
 # Provide Generic Plugin API value for plugin packages to depend on.
 # As defined in /usr/include/audacious/plugin.h: _AUD_PLUGIN_VERSION
 # This must be an exact match for plugin .so files to load.
-%global aud_plugin_api 20
-%global aud_plugin_api_min 18
+%global aud_plugin_api 30
+%global aud_plugin_api_min 30
 Provides: audacious(plugin-api) = %{aud_plugin_api}
-Provides: audacious(plugin-api) = 19
-Provides: audacious(plugin-api) = %{aud_plugin_api_min}
+#Provides: audacious(plugin-api) = 30
+#Provides: audacious(plugin-api) = %{aud_plugin_api_min}
 
 
 Name: audacious
-Version: 2.5.1
-Release: 1%{?dist}
+Version: 3.0
+Release: 0.1.alpha1%{?dist}
 
 License: GPLv3
 Summary: Advanced audio player
 URL: http://audacious-media-player.org/
 Group: Applications/Multimedia
 
-Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
-
-# Fedora customization (RFE bz #632388)
-Patch1: audacious-2.4.0-enable-gnomeshortcuts.patch
+Source0: http://distfiles.atheme.org/audacious-%{version}-alpha1.tgz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: glib2-devel
-BuildRequires: gtk2-devel
+BuildRequires: gtk3-devel
 BuildRequires: libmowgli-devel >= 0.9
 BuildRequires: libmcs-devel
 BuildRequires: libguess-devel
@@ -40,6 +35,10 @@ BuildRequires: desktop-file-utils
 BuildRequires: doxygen
 
 # The automatic SONAME dependency is not enough
+# between libmowgli 0.7.x and 0.9.50.
+Requires: libmowgli%{?_isa} >= 0.9
+
+# The automatic SONAME dependency is not enough
 # during version upgrades.
 Requires: audacious-libs = %{version}-%{release}
 
@@ -86,7 +85,7 @@ Files needed when building software for the Audacious audio player.
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-alpha1
 
 # 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!')
@@ -94,8 +93,6 @@ api=$(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\+' src/audacious/plugin.h | se
 api_min=$(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION_MIN' src/audacious/plugin.h | sed 's!.*_AUD_PLUGIN_VERSION_MIN[ ]*\([0-9]\+\).*!\1!')
 [ "${api_min}" == "%{aud_plugin_api_min}" ] || exit -1
 
-%patch1 -p1 -b .enable-gnomeshortcuts
-
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 
@@ -187,6 +184,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Jun 14 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 3.0-0.1.alpha1
+- Build with GTK+ 3.
+- Generic plugin API/ABI minimum version bumped to 30.
+- Upgrade to 3.0-alpha1.
+
 * Thu May 19 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.1-1
 - Update to 2.5.1.
 
diff --git a/sources b/sources
index 080654f..6937348 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9db3737b4ad1da63a750d6e7059d45f6  audacious-2.5.1.tgz
+e0688ceee76a31acfb7a7431084c8afd  audacious-3.0-alpha1.tgz