packages: mixxx/mixxx.spec - BR: QtScript-devel, QtWebKit-devel, portmidi-d...

[lisu]

Author: lisu                         Date: Sat Jan 29 10:49:59 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- BR: QtScript-devel, QtWebKit-devel, portmidi-devel >= 217
- use scons and __rm macro

---- Files affected:
packages/mixxx:
   mixxx.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/mixxx/mixxx.spec
diff -u packages/mixxx/mixxx.spec:1.12 packages/mixxx/mixxx.spec:1.13
--- packages/mixxx/mixxx.spec:1.12	Sat Jan 22 20:29:00 2011
+++ packages/mixxx/mixxx.spec	Sat Jan 29 11:49:54 2011
@@ -12,6 +12,8 @@
 URL:		http://mixxx.org/
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	Qt3Support-devel
+BuildRequires:	QtScript-devel
+BuildRequires:	QtWebKit-devel
 BuildRequires:	audiofile-devel
 BuildRequires:	fftw-devel
 BuildRequires:	jack-audio-connection-kit-devel
@@ -21,6 +23,7 @@
 BuildRequires:	libvorbis-devel
 BuildRequires:	pkgconfig
 BuildRequires:	portaudio-devel
+BuildRequires:	portmidi-devel >= 217
 BuildRequires:	scons
 Requires:	QtSql-sqlite3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -44,8 +47,7 @@
 export CCFLAGS="%{rpmcflags}"
 export CXX="%{__cxx}"
 export QMAKE_CXX="%{__cxx}"
-scons \
-	prefix=%{_prefix}
+%scons 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,13 +55,13 @@
 export CCFLAGS="%{rpmcflags}"
 export CXX="%{__cxx}"
 export QMAKE_CXX="%{__cxx}"
-scons prefix=%{_prefix} install_root=$RPM_BUILD_ROOT install
+%scons install install_root=$RPM_BUILD_ROOT install
 
 # I don't know why doesn't use 'prefix' option...
 install -d $RPM_BUILD_ROOT%{_prefix}
 mv $RPM_BUILD_ROOT/{bin,share} $RPM_BUILD_ROOT%{_prefix}
 
-rm -rf $RPM_BUILD_ROOT%{_docdir}/mixxx
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/mixxx
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,6 +84,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2011/01/29 10:49:54  lisu
+- BR: QtScript-devel, QtWebKit-devel, portmidi-devel >= 217
+- use scons and __rm macro
+
 Revision 1.12  2011/01/22 19:29:00  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mixxx/mixxx.spec?r1=1.12&r2=1.13&f=u