[audacious/f15] Update to 2.5.3 (merged patches).

[Michael Schwendt]

commit 85877032f97f48df3c64ee92d443275b44fe55fe
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sun Jul 3 02:36:16 2011 +0200

    Update to 2.5.3 (merged patches).

 .gitignore                        |    1 +
 audacious-2.5.2-git20110628.patch |   48 -------------------------------------
 audacious.spec                    |   10 ++++----
 sources                           |    2 +-
 4 files changed, 7 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 07aa53c..ecce55b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /audacious-2.5.0.tgz
 /audacious-2.5.1.tgz
 /audacious-2.5.2.tar.bz2
+/audacious-2.5.3.tar.gz
diff --git a/audacious.spec b/audacious.spec
index 8d98bb7..e102976 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -5,8 +5,8 @@
 # Audacious Generic Plugin API defined in audacious-libs subpackage.
 
 Name: audacious
-Version: 2.5.2
-Release: 3%{?dist}
+Version: 2.5.3
+Release: 1%{?dist}
 
 License: GPLv3
 Summary: Advanced audio player
@@ -17,8 +17,6 @@ Source0: http://distfiles.atheme.org/audacious-%{version}.tar.bz2
 
 # Fedora customization (RFE bz #632388)
 Patch1: audacious-2.4.0-enable-gnomeshortcuts.patch
-# up to git on 20110628
-Patch2: audacious-2.5.2-git20110628.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -101,7 +99,6 @@ api_min=$(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION_MIN' src/audacious/plugin.h |
 [ "${api_min}" == "%{aud_plugin_api_min}" ] || exit -1
 
 %patch1 -p1 -b .enable-gnomeshortcuts
-%patch2 -p1 -b .git-20110628
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -209,6 +206,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Jul  3 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.3-1
+- Update to 2.5.3 (merged patches).
+
 * Wed Jun 29 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.2-3
 - Add audtool2/audacious2 symlinks for compatibility with 2.4.x
   and older. These are deprecated and will be gone with Audacious 3.
diff --git a/sources b/sources
index d4e59e6..a2221eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff2d6347890c01b55493519ceae646ed  audacious-2.5.2.tar.bz2
+d61b800e2192007e71088afff9927c84  audacious-2.5.3.tar.gz