rpms/audacious/devel audacious-2.2-pkgconfig-libs.patch, NONE, 1.1 audacious.spec, 1.61, 1.62

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6881

Modified Files:
	audacious.spec 
Added Files:
	audacious-2.2-pkgconfig-libs.patch 
Log Message:
* Sun Jan 17 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-6
- In audacious.pc link with -laudcore instead of -laudclient (AUD-125).
  This removes a superfluous libaudclient dependency from all plugins and
  adds a libaudcore dependency. So far, plugins that use libaudcore
  had undefined symbols instead.


audacious-2.2-pkgconfig-libs.patch:
 audacious.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacious-2.2-pkgconfig-libs.patch ---
Don't link with libaudclient, which isn't needed by Audacious plugins
(there is a separate audclient.pc file for that!). It only creates a
superfluous dependency on libaudclient in plugins.

Do link explicitly with libaudcore, which is needed by several plugins,
which otherwise would depend on undefined symbols instead of the
libaudcore SONAME.

diff -Nur audacious-2.2-orig/audacious.pc.in audacious-2.2/audacious.pc.in
--- audacious-2.2-orig/audacious.pc.in	2009-11-22 23:43:46.000000000 +0100
+++ audacious-2.2/audacious.pc.in	2010-01-17 21:45:31.739866022 +0100
@@ -21,5 +21,5 @@
 Description: Audacious is a versatile and handy multi platform media player
 Version: @PACKAGE_VERSION@
 Requires: @PC_REQUIRES@
-Libs: -L${lib_dir} @LIBAUDCLIENT_LDFLAGS@
+Libs: -L${lib_dir} -laudcore
 Cflags: -I${audacious_include_dir}


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- audacious.spec	7 Jan 2010 17:21:31 -0000	1.61
+++ audacious.spec	17 Jan 2010 20:57:17 -0000	1.62
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -17,6 +17,8 @@ Source0: http://distfiles.atheme.org/aud
 Patch0: audacious-2.2-disabled-iplugins.patch
 # obsolete with version upgrade
 Patch1: audacious-2.2-AUD-99.patch
+# obsolete with version upgrade
+Patch2: audacious-2.2-pkgconfig-libs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,6 +78,7 @@ Files needed when building software for 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 %patch0 -p1 -b .disabled-iplugins
 %patch1 -p1 -b .AUD-99
+%patch2 -p1 -b .pkgconfig-libs
 
 # From .desktop files remove MIME types the base build of the
 # Fedora audacious-plugins package does not understand.
@@ -190,6 +193,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Jan 17 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-6
+- In audacious.pc link with -laudcore instead of -laudclient (AUD-125).
+  This removes a superfluous libaudclient dependency from all plugins and
+  adds a libaudcore dependency. So far, plugins that use libaudcore
+  had undefined symbols instead.
+
 * Thu Jan  7 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-5
 - Apply fix for seeking to -1 milliseconds, causing a hangup (AUD-99).