SPECS: kiki.spec - sorted BRs, simplified build

[qboosh]

Author: qboosh                       Date: Mon Jun 27 20:55:35 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sorted BRs, simplified build

---- Files affected:
SPECS:
   kiki.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/kiki.spec
diff -u SPECS/kiki.spec:1.14 SPECS/kiki.spec:1.15
--- SPECS/kiki.spec:1.14	Mon Jun 27 02:15:20 2005
+++ SPECS/kiki.spec	Mon Jun 27 22:55:30 2005
@@ -10,12 +10,12 @@
 # Source0-md5:	60ec6bdf0196c9c934f683d3bf7a12ea
 URL:		http://kiki.sourceforge.net/
 Patch0:		%{name}-sysconfdir.patch
-BuildRequires:	SDL_mixer-devel
 BuildRequires:	SDL_image-devel
+BuildRequires:	SDL_mixer-devel
+BuildRequires:	glut-devel
 BuildRequires:	python-devel
 BuildRequires:	python-modules
 BuildRequires:	swig-python >= 1.3.25
-BuildRequires:	glut-devel
 Requires:	python
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -32,17 +32,13 @@
 %patch0 -p1
 
 %build
-cd kodilib/linux
-
-%{__make} \
+%{__make} -C kodilib/linux \
 	CXX="%{__cxx}" \
 	SDL_CFLAGS="%{rpmcflags} -D_REENTRANT" \
 	X11INCLUDES="-I/usr/X11R6/include" \
 	PYTHONHOME=%{py_libdir}
 
-cd ../../kiki/linux
-
-%{__make} \
+%{__make} -C kiki/linux \
 	CXX="%{__cxx}" \
 	X11_INCLUDES="%{rpmcflags} -I/usr/X11R6/include" \
 	GLLIBS="-L/usr/X11R6/%{_lib} -lglut -lGLU -lGL" \
@@ -50,7 +46,7 @@
 	PYTHON_VERSION=%{py_ver} \
 	PYTHONLIBS="\
 	    /usr/%{_lib}/libpython$PYTHON_VER.so* -lutil \
-            %{py_dyndir}/math.so \
+	    %{py_dyndir}/math.so \
 	    %{py_dyndir}/time.so"
 
 %install
@@ -78,7 +74,11 @@
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
+
 $Log$
+Revision 1.15  2005/06/27 20:55:30  qboosh
+- sorted BRs, simplified build
+
 Revision 1.14  2005/06/27 00:15:20  saq
 - as of 1.3.25, swig subpackages actually contain something useful
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kiki.spec?r1=1.14&r2=1.15&f=u