rpms/neverball/devel neverball-1.5.4-dso.patch, NONE, 1.1 neverball.spec, 1.25, 1.26

[Michael Thomas]

Author: wart

Update of /cvs/pkgs/rpms/neverball/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25172

Modified Files:
	neverball.spec 
Added Files:
	neverball-1.5.4-dso.patch 
Log Message:
Add explicit link against -lX11 -lm to remove implicit library linkage (#565203)



neverball-1.5.4-dso.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE neverball-1.5.4-dso.patch ---
--- Makefile.orig	2010-04-19 10:04:10.000000000 -0700
+++ Makefile	2010-04-19 10:38:02.000000000 -0700
@@ -131,14 +131,14 @@
     OGL_LIBS  := -framework OpenGL
 endif
 
-BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS)
+BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm
 
 ifdef DARWIN
     BASE_LIBS += -L/opt/local/lib
 endif
 
 ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \
-    -lvorbisfile $(OGL_LIBS)
+    -lvorbisfile $(OGL_LIBS) -lX11
 
 #------------------------------------------------------------------------------
 


Index: neverball.spec
===================================================================
RCS file: /cvs/pkgs/rpms/neverball/devel/neverball.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- neverball.spec	11 Jan 2010 05:41:51 -0000	1.25
+++ neverball.spec	19 Apr 2010 17:49:49 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           neverball
 Version:        1.5.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Roll a ball through an obstacle course
 
@@ -10,6 +10,7 @@ URL:            http://neverball.org
 Source0:        http://neverball.org/neverball-%{version}.tar.gz
 Source1:        neverball.desktop
 Source2:        neverputt.desktop
+Patch0:         neverball-1.5.4-dso.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_image-devel, SDL_ttf-devel, SDL_mixer-devel
 BuildRequires:  freetype-devel, desktop-file-utils, zlib-devel
@@ -26,6 +27,7 @@ coins are worth 5.  Blue coins are worth
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -ansi `sdl-config --cflags`" DATADIR=%{_datadir}/%{name} %{?_smp_mflags}
@@ -66,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Mon Apr 19 2010 Wart <wart at kobold.org> - 1.5.4-3 
+- Add explicit link against -lX11 -lm to remove implicit library
+  linkage (#565203)
+
 * Sun Jan 10 2010 Wart <wart at kobold.org> - 1.5.4-2 
 - Set DATADIR so that neverball and neverputt can find their data (#538210)