From f5b22d8eb25f4f4593cdd477e14df10ac022b59f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Jul 12 2007 19:14:13 +0000 Subject: - Update to 3.0.2 - Turn mpi build back on - Add devel packages - Remove demo package no longer in upstream - Use cmake macros --- diff --git a/.cvsignore b/.cvsignore index 6454204..88fa329 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -paraview-2.4.4.tar.gz +paraview-3.0.2.tar.gz diff --git a/paraview-2.4.2-tcltk.patch b/paraview-2.4.2-tcltk.patch deleted file mode 100644 index 68c4cbf..0000000 --- a/paraview-2.4.2-tcltk.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- paraview-2.4.2/CMakeLists.txt.orig 2006-03-10 10:20:16.000000000 -0700 -+++ paraview-2.4.2/CMakeLists.txt 2006-03-10 10:22:08.000000000 -0700 -@@ -271,10 +271,10 @@ - SET(VTK_TCL_TK_INTERNALS_DIR - "${ParaView_SOURCE_DIR}/VTK/Utilities/TclTk/internals") - SET(VTK_TCL_TK_WRAPPING_DIR "${ParaView_SOURCE_DIR}/VTK/Wrapping/Tcl") -- SET(TclTk_INSTALL_NO_RUNTIME ${PV_INSTALL_NO_RUNTIME}) -- SET(TclTk_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR}) -- SET(TclTk_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR}) -- SUBDIRS(Utilities/TclTk) -+ #SET(TclTk_INSTALL_NO_RUNTIME ${PV_INSTALL_NO_RUNTIME}) -+ #SET(TclTk_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR}) -+ #SET(TclTk_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR}) -+ #SUBDIRS(Utilities/TclTk) - ENDIF (PARAVIEW_BUILD_GUI) - - # Specify python build so that we can use vtkTkRenderWidget with no diff --git a/paraview-2.4.3-png.patch b/paraview-2.4.3-png.patch deleted file mode 100644 index 3bb48e6..0000000 --- a/paraview-2.4.3-png.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- paraview-2.4.3/GUI/Widgets/CMakeLists.txt.orig 2006-03-29 10:20:37.000000000 -0700 -+++ paraview-2.4.3/GUI/Widgets/CMakeLists.txt 2006-03-29 10:22:03.000000000 -0700 -@@ -397,7 +397,6 @@ - TARGET_LINK_LIBRARIES (KWWidgets vtkParallel) - ENDIF(VTK_USE_PARALLEL OR VTK_USE_PARALLEL_ISSET) - ENDIF(VTK_WRAP_TCL) --TARGET_LINK_LIBRARIES (KWWidgets vtkpng) - - # We need KWSys - diff --git a/paraview-2.4.3-python.patch b/paraview-2.4.3-python.patch deleted file mode 100644 index 9042261..0000000 --- a/paraview-2.4.3-python.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- paraview-2.4.3/CMakeLists.txt.python 2006-03-29 16:13:54.000000000 -0700 -+++ paraview-2.4.3/CMakeLists.txt 2006-03-29 16:14:24.000000000 -0700 -@@ -472,11 +472,7 @@ - IF(PARAVIEW_WRAP_PYTHON) - FIND_PACKAGE(PythonLibs REQUIRED) - SUBDIRS(Utilities/VTKPythonWrapping) -- IF(PV_INSTALL_NO_LIBRARIES) -- SET(VTKPythonWrapping_INSTALL_LIBRARIES 0) -- ELSE(PV_INSTALL_NO_LIBRARIES) -- SET(VTKPythonWrapping_INSTALL_LIBRARIES 1) -- ENDIF(PV_INSTALL_NO_LIBRARIES) -+ SET(VTKPythonWrapping_INSTALL_LIBRARIES 1) - SET(VTKPythonWrapping_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR}) - SET(VTKPythonWrapping_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR}) - ENDIF(PARAVIEW_WRAP_PYTHON) diff --git a/paraview-2.4.4-cmake245.patch b/paraview-2.4.4-cmake245.patch deleted file mode 100644 index 25792e7..0000000 --- a/paraview-2.4.4-cmake245.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- paraview-2.4.4/Utilities/IceT/doc/man/CMakeLists.txt.cmake245 2005-08-03 07:07:15.000000000 -0600 -+++ paraview-2.4.4/Utilities/IceT/doc/man/CMakeLists.txt 2007-01-16 09:38:51.000000000 -0700 -@@ -45,15 +45,19 @@ - MAKE_DIRECTORY(${CMAKE_CURRENT_BINARY_DIR}/man7) - - MACRO(ICET_LINK_MAN3_FILE srcfile destfile) -- ADD_CUSTOM_TARGET(man3/${destfile}.3 ALL -- ln -sf ${ICET_SOURCE_DIR}/doc/man/man3/${srcfile}.3 man3/${destfile}.3 -+ ADD_CUSTOM_COMMAND( -+ OUTPUT man3/${destfile}.3 -+ COMMAND ln -+ ARGS -sf ${ICET_SOURCE_DIR}/doc/man/man3/${srcfile}.3 man3/${destfile}.3 - DEPENDS man3) - INSTALL_FILES(/man/man3 FILES ${ICET_BINARY_DIR}/doc/man/man3/${destfile}.3) - ENDMACRO(ICET_LINK_MAN3_FILE) - - MACRO(ICET_LINK_MAN7_FILE srcfile destfile) -- ADD_CUSTOM_TARGET(man7/${destfile}.7 ALL -- ln -sf ${ICET_SOURCE_DIR}/doc/man/man7/${srcfile}.7 man7/${destfile}.7 -+ ADD_CUSTOM_COMMAND( -+ OUTPUT man7/${destfile}.7 -+ COMMAND ln -+ ARGS -sf ${ICET_SOURCE_DIR}/doc/man/man7/${srcfile}.7 man7/${destfile}.7 - DEPENDS man7) - INSTALL_FILES(/man/man7 FILES ${ICET_BINARY_DIR}/doc/man/man7/${destfile}.7) - ENDMACRO(ICET_LINK_MAN7_FILE) -@@ -71,5 +75,5 @@ - ICET_LINK_MAN7_FILE(ICE-T ice-t) - ICET_LINK_MAN7_FILE(ICE-T icet) - --INSTALL_FILES(/man/man3 FILES ${MAN3_FILES}) --INSTALL_FILES(/man/man7 FILES ${MAN7_FILES}) -+INSTALL_FILES(/share/man/man3 FILES ${MAN3_FILES}) -+INSTALL_FILES(/share/man/man7 FILES ${MAN7_FILES}) diff --git a/paraview-2.4.4-const.patch b/paraview-2.4.4-const.patch deleted file mode 100644 index faf1448..0000000 --- a/paraview-2.4.4-const.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r1.76 vtkPythonUtil.cxx ---- VTK/Common/vtkPythonUtil.cxx 4 Aug 2005 16:19:14 -0000 1.76 -+++ VTK/Common/vtkPythonUtil.cxx 18 Dec 2006 20:16:46 -0000 -@@ -768,7 +768,7 @@ - } - if (strcmp(name, "__doc__") == 0) - { -- char *doc = t->tp_doc; -+ const char *doc = t->tp_doc; - if (doc != NULL) - { - return PyString_FromString(doc); diff --git a/paraview.spec b/paraview.spec index eaba6d0..1526992 100644 --- a/paraview.spec +++ b/paraview.spec @@ -1,33 +1,36 @@ -%{!?build_mpi:%define build_mpi 0} +%{!?build_mpi:%define build_mpi 1} Name: paraview -Version: 2.4.4 -Release: 6%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: Parallel visualization application Group: Applications/Engineering License: Distributable URL: http://www.paraview.org/ -Source0: http://www.paraview.org/files/v2.4/paraview-%{version}.tar.gz +# This version was actually made with: +# cvs -d :pserver:anoncvs@www.paraview.org:/cvsroot/ParaView3 login +# (respond with empty password) +# cvs -d :pserver:anoncvs@www.paraview.org:/cvsroot/ParaView3 -z3 export -r ParaView_3_0_2 ParaView3 +# mv ParaView3 paraview-3.0.2 +# tar czf paraview-3.0.2.tar.gz paraview-3.0.2 +# +# Next release promises to provide a source tarball +Source0: http://www.paraview.org/files/v3.0/paraview-%{version}.tar.gz Source1: paraview_22x22.png Source2: paraview.xml -Patch0: paraview-2.4.2-tcltk.patch -Patch1: paraview-2.4.3-png.patch -Patch2: paraview-2.4.3-python.patch -Patch3: paraview-2.4.4-const.patch -Patch4: paraview-2.4.4-cmake245.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake %if %{build_mpi} BuildRequires: openmpi-devel %endif -BuildRequires: libGLU-devel, libXt-devel, mesa-libOSMesa-devel +BuildRequires: qt4-devel, mesa-libOSMesa-devel BuildRequires: python-devel, tk-devel, hdf5-devel -BuildRequires: freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel +BuildRequires: freetype-devel, libtiff-devel, zlib-devel BuildRequires: expat-devel BuildRequires: /usr/bin/desktop-file-install - +BuildRequires: doxygen, graphviz Requires: %{name}-data = %{version}-%{release} Requires(post): /usr/bin/update-desktop-database Requires(postun): /usr/bin/update-desktop-database @@ -75,11 +78,10 @@ various Unix workstations and clusters. Under the hood, ParaView uses the Visualization Toolkit as the data processing and rendering engine and has a user interface written using a unique blend of Tcl/Tk and C++. -NOTE: This version has been compiled with LAM-MPI support and requires an -operating LAM-MPI runtime enviroment. +NOTE: This version has been compiled with OpenMPI support and requires an +operating OpenMPI runtime enviroment. %endif - %package data Summary: Data files for ParaView Group: Applications/Engineering @@ -91,24 +93,27 @@ Requires(postun): /usr/bin/update-mime-database %{summary}. -%package demos -Summary: Demo files for ParaView +%package devel +Summary: Development files for ParaView Group: Applications/Engineering -Requires: %{name}-data = %{version}-%{release} +Requires: %{name} = %{version}-%{release} + +%description devel +%{summary}. + -%description demos +%package mpi-devel +Summary: Development files for the mpi version of ParaView +Group: Applications/Engineering +Requires: %{name}-mpi = %{version}-%{release} + +%description mpi-devel %{summary}. %prep %setup -q -%patch -p1 -b .tcltk -%patch1 -p1 -b .png -%patch2 -p1 -b .python -%patch3 -p0 -b .const -%patch4 -p1 -b .cmake245 rm -rf Utilities/TclTk -sed -i -e 's,INSTALL_FILES(/man/,INSTALL_FILES(/share/man/,' Utilities/IceT/doc/man/CMakeLists.txt %build @@ -120,19 +125,16 @@ export CXX='g++' export MAKE='make' export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" -cmake .. \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview-2.4 \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ +%cmake .. \ + -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview \ -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \ -DCMAKE_C_COMPILER:FILEPATH=$CC \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DTCL_LIBRARY:PATH=tcl \ -DTK_LIBRARY:PATH=tk \ + -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \ -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \ - -DPARAVIEW_WRAP_PYTHON:BOOL=ON \ -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ + -DVTK_USE_INFOVIS:BOOL=OFF \ -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ @@ -141,7 +143,8 @@ cmake .. \ -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON -make +cmake .. +make VERBOSE=1 %{?_smp_flags} popd %if %{build_mpi} mkdir fedora-mpi @@ -151,22 +154,20 @@ export CXX='mpic++' export MAKE='make' export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" -cmake .. \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview-2.4-mpi \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ +%cmake .. \ + -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview-mpi \ -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \ -DCMAKE_C_COMPILER:FILEPATH=$CC \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DTCL_LIBRARY:PATH=tcl \ -DTK_LIBRARY:PATH=tk \ + -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \ -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \ - -DPARAVIEW_WRAP_PYTHON:BOOL=ON \ + -DICET_BUILD_TESTING:BOOL=ON \ -DVTK_USE_MPI:BOOL=ON \ -DMPI_INCLUDE_PATH:PATH="%{_includedir}/openmpi" \ -DMPI_LIBRARY:STRING="-L%{_libdir}/openmpi" \ -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ + -DVTK_USE_INFOVIS:BOOL=OFF \ -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ @@ -175,7 +176,8 @@ cmake .. \ -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \ -DBUILD_DOCUMENTATION:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON -make +cmake .. +make VERBOSE=1 %{?_smp_flags} %endif %install @@ -195,11 +197,8 @@ install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/mime/packages # Install mpi version pushd fedora-mpi make install DESTDIR=$RPM_BUILD_ROOT -#Get rid of useless man and cmake files -install -m 755 bin/libvtkPVServerCommonPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/ -install -m 755 bin/libvtkPVServerManagerPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/ -rm -rf $RPM_BUILD_ROOT%{_mandir} -rm $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/*ICET*cmake + +#Create desktop file cat > paraview-mpi.desktop < paraview.desktop < /dev/null ||: + %postun update-desktop-database &> /dev/null ||: @@ -279,7 +281,6 @@ update-desktop-database &> /dev/null ||: update-desktop-database &> /dev/null ||: %endif - %post data update-mime-database %{_datadir}/mime &> /dev/null || : @@ -289,48 +290,58 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files %defattr(-,root,root,-) -%doc Copyright.txt README.html +%doc License_v1.1.txt %{_bindir}/paraview -%{_bindir}/pvbatch -%{_bindir}/pvclient %{_bindir}/pvdataserver %{_bindir}/pvpython %{_bindir}/pvrenderserver %{_bindir}/pvserver +%{_bindir}/pvTestDriver +%{_bindir}/vtkSMExtractDocumentation %{_datadir}/applications/fedora-paraview.desktop -%{_libdir}/paraview-2.4/ +%{_libdir}/paraview/ %if %{build_mpi} %files mpi %defattr(-,root,root,-) -%doc Copyright.txt README.html +%doc License_v1.1.txt %{_bindir}/paraview-mpi -%{_bindir}/pvbatch-mpi -%{_bindir}/pvclient-mpi %{_bindir}/pvdataserver-mpi %{_bindir}/pvpython-mpi %{_bindir}/pvrenderserver-mpi %{_bindir}/pvserver-mpi +%{_bindir}/pvTestDriver-mpi +%{_bindir}/vtkSMExtractDocumentation-mpi %{_datadir}/applications/fedora-paraview-mpi.desktop -%{_libdir}/paraview-2.4-mpi/ +%{_libdir}/paraview-mpi/ %endif %files data %defattr(-,root,root,-) -%{_datadir}/paraview-2.4/ -%exclude %{_datadir}/paraview-2.4/Demos %{_datadir}/pixmaps/paraview_22x22.png %{_datadir}/mime/packages/paraview.xml -%files demos +%files devel %defattr(-,root,root,-) -%{_datadir}/paraview-2.4/Demos/ +%{_includedir}/paraview-3.0/ + + +%files mpi-devel +%defattr(-,root,root,-) +%{_includedir}/paraview-3.0-mpi/ %changelog +* Wed Jul 11 2007 - Orion Poplawski - 3.0.2-1 +- Update to 3.0.2 +- Turn mpi build back on +- Add devel packages +- Remove demo package no longer in upstream +- Use cmake macros + * Thu Mar 08 2007 - Orion Poplawski - 2.4.4-6 - Don't build mpi version until upstream fixes the build system diff --git a/sources b/sources index 2682760..c6aa2ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f8e926542268546563e8e8c1d4ad852 paraview-2.4.4.tar.gz +3184bd889d1cc8c2d1efc7c8ed3e3759 paraview-3.0.2.tar.gz