[packages/neverball] add dso.patch from fedora; verbose files; spec cosmetics

[glen]

commit 06ae0c6681f7c4518add2bcd7c801216ed0accdd
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Mar 1 20:30:11 2013 +0200

    add dso.patch from fedora; verbose files; spec cosmetics

 dso.patch      | 19 +++++++++++++++++++
 neverball.spec | 21 +++++++++++++--------
 2 files changed, 32 insertions(+), 8 deletions(-)
---
diff --git a/neverball.spec b/neverball.spec
index fe3c1e4..ff43073 100644
--- a/neverball.spec
+++ b/neverball.spec
@@ -3,6 +3,7 @@
 #  - correct home_etc
 #  - put highscores files in proper place
 #  - use our ttf fonts
+#    %{_datadir}/neverball/ttf/DejaVuSans-Bold.ttf
 #
 Summary:	Neverball - 3D game with rolling the ball
 Summary(pl.UTF-8):	Neverball - gra 3D polegająca na toczeniu kulki
@@ -19,6 +20,7 @@ Source2:	neverputt.desktop
 Source3:	%{name}.png
 Patch0:		%{name}-datadir.patch
 Patch1:		%{name}-font.patch
+Patch2:		dso.patch
 URL:		http://icculus.org/neverball/
 BuildRequires:	OpenGL-devel
 BuildRequires:	SDL_ttf-devel
@@ -55,21 +57,22 @@ Neverballa.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 
 %build
 %{__make} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -ansi `sdl-config --cflags`"
+	CFLAGS="%{rpmcflags} -ansi $(sdl-config --cflags)"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_pixmapsdir}} \
 	$RPM_BUILD_ROOT%{_desktopdir}
 
-install never{ball,putt} $RPM_BUILD_ROOT%{_bindir}
-cp -R data/* $RPM_BUILD_ROOT%{_datadir}/%{name}
-install %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
+install -p never{ball,putt} $RPM_BUILD_ROOT%{_bindir}
+cp -Rp data/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/Makefile*
 
@@ -79,7 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/neverball
+%attr(755,root,root) %{_bindir}/neverputt
 %{_datadir}/%{name}
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%{_desktopdir}/neverball.desktop
+%{_desktopdir}/neverputt.desktop
+%{_pixmapsdir}/neverball.png
diff --git a/dso.patch b/dso.patch
new file mode 100644
index 0000000..9d2b885
--- /dev/null
+++ b/dso.patch
@@ -0,0 +1,19 @@
+--- 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
+ 
+ #------------------------------------------------------------------------------
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/neverball.git/commitdiff/78933bd210b96af6307c99a858d763c16bd9b183