rpms/neverball/FC-4 neverball-rpath.patch, NONE, 1.1 neverball.spec, 1.9, 1.10

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/neverball/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066

Modified Files:
	neverball.spec 
Added Files:
	neverball-rpath.patch 
Log Message:
Remove rpath from x86_64 binary (bz #173819)



neverball-rpath.patch:

--- NEW FILE neverball-rpath.patch ---
--- Makefile	2004-09-08 13:31:40.000000000 -0700
+++ ../neverball-1.4.0.new/Makefile	2006-02-27 13:25:50.000000000 -0800
@@ -16,7 +16,7 @@
 #CFLAGS= -Wall -pg -ansi $(shell sdl-config --cflags)
 
 SDL_LIBS= $(shell sdl-config --libs)
-FT2_LIBS= $(shell freetype-config --libs)
+FT2_LIBS= $(shell freetype-config --libs | sed 's|-Wl,--rpath -Wl,/usr/lib64 ||')
 
 MAPC_TARG= mapc
 BALL_TARG= neverball


Index: neverball.spec
===================================================================
RCS file: /cvs/extras/rpms/neverball/FC-4/neverball.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- neverball.spec	23 May 2005 00:24:05 -0000	1.9
+++ neverball.spec	2 Mar 2006 15:52:19 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           neverball
 Version:        1.4.0
-Release: 4
+Release:        5
 
 Summary:        Roll a ball through an obstacle course
 
@@ -9,6 +9,7 @@
 URL:            http://icculus.org/neverball/
 Source0:        http://icculus.org/neverball/neverball-%{version}.tar.gz
 Patch0:         neverball-datadir.patch
+Patch1:         neverball-rpath.patch
 Source1:        neverball.desktop
 Source2:        neverputt.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,18 +26,22 @@
 %prep
 %setup -q
 %patch0
+%patch1
+# Remove some execute bits to prevent rpmlint warnings in the debuginfo
+# package.
+find data putt share -type f -exec chmod a-x {} \;
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS -ansi `sdl-config --cflags`"
+make CFLAGS="$RPM_OPT_FLAGS -ansi `sdl-config --cflags`" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -p -D -m0755 neverball $RPM_BUILD_ROOT/%{_bindir}/neverball
 install -p -D -m0755 neverputt $RPM_BUILD_ROOT/%{_bindir}/neverputt
-install -p -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/neverball/
+install -p -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/
 install -p -D -m0644 icon/neverball.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverball.png
 install -p -D -m0644 icon/neverputt.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverputt.png
-cp -ap  data/* $RPM_BUILD_ROOT/%{_datadir}/neverball/
+cp -ap  data/* $RPM_BUILD_ROOT/%{_datadir}/%{name}/
 
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
@@ -60,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Mon Feb 27 2006 Wart <wart at kobold.org> - 1.4.0-5
+- Added smp_mflags to compile line to speed up build on smp machines
+- Added patch to remove rpath on FC4
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.4.0-4
 - rebuild on all arches