diff --git a/paraview.spec b/paraview.spec index 5221ab3..ad989e5 100644 --- a/paraview.spec +++ b/paraview.spec @@ -6,7 +6,7 @@ Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 5%{?dist} +Release: 6%{?dist} Summary: Parallel visualization application Group: Applications/Engineering @@ -247,12 +247,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 @@ -297,8 +297,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} \ @@ -329,7 +331,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files %defattr(-,root,root,-) %doc License_v1.2.txt -%{_bindir}/lproj %{_bindir}/paraview %{_bindir}/pvbatch %{_bindir}/pvblot @@ -377,6 +378,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Mon Aug 31 2009 Orion Poplawski - 3.6.1-6 +- Don't ship lproj, conflicts with vtk + * Thu Aug 27 2009 Orion Poplawski - 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