rpms/paraview/F-11 paraview.spec,1.35,1.36

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/paraview/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20394/F-11

Modified Files:
	paraview.spec 
Log Message:
* Mon Aug 31 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-6
- Don't ship lproj, conflicts with vtk



Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-11/paraview.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- paraview.spec	28 Aug 2009 18:00:09 -0000	1.35
+++ paraview.spec	31 Aug 2009 14:29:41 -0000	1.36
@@ -6,7 +6,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -246,12 +246,12 @@ pushd fedora-mpi
 make install DESTDIR=$RPM_BUILD_ROOT
 
 #Don't ship copy of Qt assisstant
-rm -f $RPM_BUILD_ROOT%{_bindir}/assistant \
-      $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/assistant-real
+rm $RPM_BUILD_ROOT%{_bindir}/assistant \
+   $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/assistant-real
 #Cleanup %{_bindir}
 pushd $RPM_BUILD_ROOT/%{_bindir}
 #Don't need mpi versions of these
-rm -f lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation
+rm lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation
 #Move the remaining mpi binaries out of the way
 for f in *
 do
@@ -296,8 +296,10 @@ popd
 rm -r $RPM_BUILD_ROOT/usr/plugins
 
 #Don't ship copy of Qt assisstant
-rm -f $RPM_BUILD_ROOT%{_bindir}/assistant \
-      $RPM_BUILD_ROOT%{_libdir}/paraview/assistant-real
+rm $RPM_BUILD_ROOT%{_bindir}/assistant \
+   $RPM_BUILD_ROOT%{_libdir}/paraview/assistant-real
+#Don't ship lproj - provided by vtk
+rm lproj
 
 #Move the documentation
 #mv $RPM_BUILD_ROOT%{_libdir}/paraview/{Documentation,pqClient.adp} \
@@ -328,7 +330,6 @@ update-mime-database %{_datadir}/mime &>
 %files
 %defattr(-,root,root,-)
 %doc License_v1.2.txt
-%{_bindir}/lproj
 %{_bindir}/paraview
 %{_bindir}/pvbatch
 %{_bindir}/pvblot
@@ -376,6 +377,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Mon Aug 31 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-6
+- Don't ship lproj, conflicts with vtk
+
 * Thu Aug 27 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-5
 - Specify PV_INSTALL_LIB_DIR as relative path, drop install prefix patch
 - Update assitant patch to use assistant_adp, don't ship assistant-real