rpms/gxmms2/devel gxmms2-0.7.0-implicit-DSO-libX11.patch, NONE, 1.1 gxmms2.spec, 1.4, 1.5

[Tom Callaway]

Author: spot

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

Modified Files:
	gxmms2.spec 
Added Files:
	gxmms2-0.7.0-implicit-DSO-libX11.patch 
Log Message:
fix implicit DSO linking

gxmms2-0.7.0-implicit-DSO-libX11.patch:
 Makefile |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE gxmms2-0.7.0-implicit-DSO-libX11.patch ---
diff -up gxmms2/Makefile.DSO gxmms2/Makefile
--- gxmms2/Makefile.DSO	2010-02-10 14:28:09.715658532 -0500
+++ gxmms2/Makefile	2010-02-10 14:29:29.821776218 -0500
@@ -10,10 +10,12 @@ GTK_CFLAGS=$(shell pkg-config gtk+-2.0 -
 GTK_LIB=$(shell pkg-config gtk+-2.0 --libs)
 XMMS2_CFLAGS=$(shell pkg-config xmms2-client xmms2-client-glib --cflags)
 XMMS2_LIB=$(shell pkg-config xmms2-client xmms2-client-glib --libs)
+X11_CFLAGS=$(shell pkg-config x11 --cflags)
+X11_LIB=$(shell pkg-config x11 --libs)
 
 CFLAGS ?= -O2
-CFLAGS := -Wall -fPIC $(GTK_CFLAGS) $(XMMS2_CFLAGS) -I. $(CFLAGS)
-LIBS = $(GTK_LIB) $(XMMS2_LIB)
+CFLAGS := -Wall -fPIC $(GTK_CFLAGS) $(XMMS2_CFLAGS) $(X11_CFLAGS) -I. $(CFLAGS)
+LIBS = $(GTK_LIB) $(XMMS2_LIB) $(X11_LIB)
 
 KRELLLFLAGS=-shared
 


Index: gxmms2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gxmms2/devel/gxmms2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gxmms2.spec	11 Aug 2009 20:55:26 -0000	1.4
+++ gxmms2.spec	10 Feb 2010 19:36:05 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		gxmms2
 Summary: 	A graphical audio player
 Version:	0.7.0
-Release:	5.20090811git%{?dist}
+Release:	6.20090811git%{?dist}
 License:	GPLv2
 Group:		Applications/Multimedia
 # No stable release supports xmms 0.6 yet
@@ -11,6 +11,7 @@ Group:		Applications/Multimedia
 # Source0:	http://wejp.k.vu/projects/xmms2/%{name}-%{version}.tar.gz
 Source0:	%{name}-20090811git.tar.bz2
 Source1:	%{name}.desktop
+Patch0:		gxmms2-0.7.0-implicit-DSO-libX11.patch
 URL:		http://wejp.k.vu/projects/xmms2/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	xmms2-devel >= 0.6, gtk2-devel, pango-devel, atk-devel
@@ -35,6 +36,7 @@ library window.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1 -b .DSO 
 sed -i 's|/lib/|/%{_lib}/|g' Makefile
 
 %build
@@ -68,6 +70,9 @@ rm -rf %{buildroot}
 %{_libdir}/gkrellm2/plugins/gkrellxmms2.so
 
 %changelog
+* Wed Feb 10 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.7.0-6.20090811git
+- fix implicit DSO linking issue with libX11
+
 * Tue Aug 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.7.0-5.20090811git
 - update to git checkout to support xmms 0.6