From a5e5df708405cd2d5c872cccb2b26f145741870b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 23 Dec 2010 15:56:59 +0900
Subject: [PATCH] Get rpms building again.

Need to make packages for jack, qtv and maybe sdl32, but that can wait.
---
 RPM/build_rpm.in       | 19 +++++++++----------
 RPM/quakeforge.spec.in | 22 +++++++++++-----------
 RPM/rpmrc              |  2 +-
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/RPM/build_rpm.in b/RPM/build_rpm.in
index 7ec62b097..11ee48273 100644
--- a/RPM/build_rpm.in
+++ b/RPM/build_rpm.in
@@ -9,17 +9,16 @@ top_srcdir=@top_srcdir@
 top_builddir=..
 
 mkdir -p RPMS/{noarch,i386,i686}
-test -d $top_srcdir/CVS && make -C $top_builddir changelog
+touch $top_builddir/ChangeLog
 make -C $top_builddir dist
-cat > rpmmacros <<EOF
-%_topdir    $PWD
-%_rpmdir    $PWD/RPMS
-%_sourcedir $top_builddir
-%_specdir   $PWD
-%_srcrpmdir $PWD
-%_builddir  $PWD
-EOF
-rpmbuild -ba quakeforge.spec --rcfile $srcdir/rpmrc
+rpmbuild \
+	--define="_topdir $PWD" \
+	--define="_rpmdir $PWD/RPMS" \
+	--define="_sourcedir $top_builddir" \
+	--define="_specdir $PWD" \
+	--define="_srcrpmdir $PWD" \
+	--define="_builddir $PWD" \
+	-ba quakeforge.spec
 find . -maxdepth 1 -type d -name 'quakeforge-*' -exec rm -rf {} \;
 find RPMS -name '*.rpm' -exec mv {} . \;
 rm -rf RPMS
diff --git a/RPM/quakeforge.spec.in b/RPM/quakeforge.spec.in
index da92d3e6a..7b4d48826 100644
--- a/RPM/quakeforge.spec.in
+++ b/RPM/quakeforge.spec.in
@@ -292,11 +292,7 @@ This sub-package provides the quake-game pseudo package.
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
-if test -f /proc/cpuinfo; then
-	make -j`grep processor /proc/cpuinfo | wc -l`
-else
-	make
-fi
+make $QFSMP
 
 %install
 if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
@@ -305,14 +301,17 @@ mkdir -p $RPM_BUILD_ROOT/etc
 make install DESTDIR=$RPM_BUILD_ROOT
 cp RPM/quakeforge.conf $RPM_BUILD_ROOT/etc
 mkdir -p $RPM_BUILD_ROOT/%{fs_sharepath}/id1
-rm $RPM_BUILD_ROOT/usr/lib/quakeforge/*.{a,la}
+find $RPM_BUILD_ROOT/usr/lib/quakeforge -name '*.a' -exec rm {} \;
+find $RPM_BUILD_ROOT/usr/lib/quakeforge -name '*.la' -exec rm {} \;
 rm $RPM_BUILD_ROOT/usr/bin/hw-master
 rm $RPM_BUILD_ROOT/usr/bin/nq-fbdev
 rm $RPM_BUILD_ROOT/usr/bin/nq-sdl32
-rm $RPM_BUILD_ROOT/usr/bin/qtv
 rm $RPM_BUILD_ROOT/usr/bin/qw-client-fbdev
 rm $RPM_BUILD_ROOT/usr/bin/qw-client-sdl32
-rm $RPM_BUILD_ROOT/usr/lib/libQFrenderer_sw32.*
+find $RPM_BUILD_ROOT/usr/lib -name 'libQFrenderer_sw32.*' -exec rm {} \;
+#FIXME until I feel like making packages
+rm $RPM_BUILD_ROOT/usr/bin/qtv
+find $RPM_BUILD_ROOT/usr/lib/quakeforge -name 'snd_render_jack*' -exec rm {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -406,8 +405,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %if "%{HAVE_SDL}"=="'yes'"
 %files sdl-common
-%attr(-,root,root)	%{_prefix}/lib/quakeforge/cd_sdl.so
-%attr(-,root,root)	%{_prefix}/lib/quakeforge/snd_output_sdl.so
+%attr(-,root,root)	%{_prefix}/lib/quakeforge/cd_sdl.so*
+%attr(-,root,root)	%{_prefix}/lib/quakeforge/snd_output_sdl.so*
 
 %files sdl
 %attr(-,root,root)	%{_prefix}/bin/qw-client-sdl
@@ -437,7 +436,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %if "%{HAVE_ALSA}"=="'yes'"
 %files alsa
-%attr(-,root,root)	%{_prefix}/lib/quakeforge/%{ALSA_PLUGIN}.so*
+%attr(-,root,root)	%{_prefix}/lib/quakeforge/snd_output_alsa.so*
 %endif
 
 %if "%{HAVE_OSS}"=="'yes'"
@@ -450,6 +449,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(-,root,root)	%{_prefix}/bin/qfpreqcc
 %attr(-,root,root)	%{_prefix}/share/man/man1/qfcc.1.gz
 %attr(-,root,root)	%{_prefix}/include/QF/ruamoko/*
+%attr(-,root,root)	%{_prefix}/lib/pkgconfig/qfcc.pc
 %attr(-,root,root)	%{_prefix}/lib/ruamoko/*
 
 %files utils
diff --git a/RPM/rpmrc b/RPM/rpmrc
index 21978ea8a..e15866e2f 100644
--- a/RPM/rpmrc
+++ b/RPM/rpmrc
@@ -1 +1 @@
-macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/etc/rpm/macros:/etc/rpm/%{_target}/macros:~/.rpmmacros:rpmmacros
+macrofiles: .rpmmacros