packages: ParaView/ParaView.spec - updated BR - adapter - comment out patch...

[baggins]

Author: baggins                      Date: Fri Feb 17 11:41:30 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated BR
- adapter
- comment out patch we don't need yet

---- Files affected:
packages/ParaView:
   ParaView.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/ParaView/ParaView.spec
diff -u packages/ParaView/ParaView.spec:1.1 packages/ParaView/ParaView.spec:1.2
--- packages/ParaView/ParaView.spec:1.1	Fri Feb 17 12:11:39 2012
+++ packages/ParaView/ParaView.spec	Fri Feb 17 12:41:25 2012
@@ -14,6 +14,13 @@
 Patch1:		%{name}-3.12.0-boost-1.48.0-bfs.patch
 Patch2:		%{name}-gcc47.patch
 Patch3:		%{name}-3.2.2-hdf5.patch
+BuildRequires:	Mesa-libOSMesa-devel
+BuildRequires:	QtDesigner-devel
+BuildRequires:	QtHelp-devel
+BuildRequires:	QtSql-devel
+BuildRequires:	QtSql-sqlite
+BuildRequires:	QtUiTools-devel
+BuildRequires:	QtWebKit-devel
 BuildRequires:	boost-devel
 BuildRequires:	cmake
 BuildRequires:	desktop-file-utils
@@ -27,16 +34,9 @@
 BuildRequires:	libpng-devel
 BuildRequires:	libtheora-devel
 BuildRequires:	libtiff-devel
-BuildRequires:	Mesa-libOSMesa-devel
 BuildRequires:	openssl-devel
 BuildRequires:	python-devel
 BuildRequires:	qt4-build
-BuildRequires:	QtWebKit-devel
-BuildRequires:	QtSql-devel
-BuildRequires:	QtSql-sqlite
-BuildRequires:	QtUiTools-devel
-BuildRequires:	QtHelp-devel
-BuildRequires:	QtDesigner-devel
 BuildRequires:	readline-devel
 BuildRequires:	tk-devel
 BuildRequires:	wget
@@ -97,7 +97,8 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+# We don't have boot 1.48 yet
+#%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 #Remove included hdf5 just to be sure
@@ -146,7 +147,8 @@
 install %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/mime/packages
 
 cd build
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 #Create desktop file
 cat > $RPM_BUILD_ROOT%{_desktopdir}/paraview.desktop <<EOF
@@ -217,6 +219,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/02/17 11:41:25  baggins
+- updated BR
+- adapter
+- comment out patch we don't need yet
+
 Revision 1.1  2012/02/17 11:11:39  baggins
 - new, based on fedora
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ParaView/ParaView.spec?r1=1.1&r2=1.2&f=u