diff --git a/.cvsignore b/.cvsignore index 88fa329..8b69f47 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -paraview-3.0.2.tar.gz +paraview-3.2.1.tar.gz diff --git a/paraview-3.2-qt.patch b/paraview-3.2-qt.patch new file mode 100644 index 0000000..d5e0978 --- /dev/null +++ b/paraview-3.2-qt.patch @@ -0,0 +1,17 @@ +--- ParaView3.2/Qt/CMakeLists.txt.qt 2007-11-09 14:21:59.000000000 -0700 ++++ ParaView3.2/Qt/CMakeLists.txt 2007-11-09 14:22:11.000000000 -0700 +@@ -10,14 +10,6 @@ + MESSAGE(SEND_ERROR "Qt ${QT_MIN_VERSION} or greater not found. Please check the QT_QMAKE_EXECUTABLE variable.") + ELSE(NOT QT4_FOUND) + +-# To make support of ParaView tractable, we only support a single version +-# of Qt at one time. If you really want to use a newer version of Qt, you +-# can delete this check, but you are on your own. +-STRING(REGEX MATCH "^4\\.2\\.[0-9]+" qt_version_tmp "${QTVERSION}") +-IF (NOT qt_version_tmp) +- MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported. Please use Qt 4.2.") +-ENDIF (NOT qt_version_tmp) +- + # help CMake fine QtUiTools on Mac (binary install) + IF(Q_WS_MAC AND QT4_FOUND AND QT_QTCORE_FOUND AND NOT QT_QTUITOOLS_FOUND) + FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_RELEASE NAMES QtUiTools PATHS ${QT_LIBRARY_DIR}) diff --git a/paraview-3.2.1-assistant-qt4.patch b/paraview-3.2.1-assistant-qt4.patch new file mode 100644 index 0000000..6a2e531 --- /dev/null +++ b/paraview-3.2.1-assistant-qt4.patch @@ -0,0 +1,11 @@ +--- ParaView3.2.1/Applications/Client/MainWindow.cxx.assistant-qt4 2007-11-07 13:52:05.000000000 -0700 ++++ ParaView3.2.1/Applications/Client/MainWindow.cxx 2007-12-03 14:30:44.000000000 -0700 +@@ -896,7 +896,7 @@ + QString assistantExe; + QString profileFile; + +- const char* assistantName = "assistant"; ++ const char* assistantName = "assistant-qt4"; + #if defined(Q_WS_WIN) + const char* binDir = "\\"; + const char* binDir1 = "\\..\\"; diff --git a/paraview-3.2.1-doc.patch b/paraview-3.2.1-doc.patch new file mode 100644 index 0000000..726b024 --- /dev/null +++ b/paraview-3.2.1-doc.patch @@ -0,0 +1,46 @@ +--- ParaView3.2.1/Applications/Client/CMakeLists.txt.doc 2007-11-20 09:14:25.000000000 -0700 ++++ ParaView3.2.1/Applications/Client/CMakeLists.txt 2007-11-30 16:37:26.000000000 -0700 +@@ -134,7 +134,7 @@ + EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_BINS" + OUTPUT_VARIABLE PV_ASSISTANT) + FILE(TO_NATIVE_PATH "${PV_ASSISTANT}/" PV_ASSISTANT) +-FILE(TO_NATIVE_PATH "${ParaView_BINARY_DIR}/pqClient.adp" PV_CLIENT_DOC) ++FILE(TO_NATIVE_PATH "/usr/share/paraview/pqClient.adp" PV_CLIENT_DOC) + + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/pqClientDocFinder.txt.in" + "${EXECUTABLE_OUTPUT_PATH}/pqClientDocFinder.txt" +--- ParaView3.2.1/Documentation/CMakeLists.txt.doc 2007-11-07 13:51:40.000000000 -0700 ++++ ParaView3.2.1/Documentation/CMakeLists.txt 2007-12-05 11:59:09.000000000 -0700 +@@ -149,9 +149,9 @@ + + set(dir "${ParaView_BINARY_DIR}/Documentation/") + install(DIRECTORY ${ParaView_BINARY_DIR}/Documentation/ +- DESTINATION ${PV_EXE_INSTALL_CM24}/Documentation ++ DESTINATION /usr/share/paraview/Documentation + COMPONENT Runtime + REGEX ".html") + + install(FILES ${ParaView_BINARY_DIR}/pqClient.adp +- DESTINATION ${PV_EXE_INSTALL_CM24} COMPONENT Runtime ) ++ DESTINATION /usr/share/paraview COMPONENT Runtime ) +--- ParaView3.2.1/Applications/Client/MainWindow.cxx.doc 2007-12-05 20:55:45.000000000 -0700 ++++ ParaView3.2.1/Applications/Client/MainWindow.cxx 2007-12-05 20:57:35.000000000 -0700 +@@ -947,17 +947,7 @@ + QStringList args; + args.append(QString("-profile")); + +- if(profileFile.isEmpty()) +- { +- // see if help is bundled up with the application +- QString profile = ::Locate("pqClient.adp"); +- /*QCoreApplication::applicationDirPath() + QDir::separator() +- + QString("pqClient.adp");*/ +- if(QFile::exists(profile)) +- { +- profileFile = profile; +- } +- } ++ profileFile = QString("/usr/share/paraview/pqClient.adp"); + + if(profileFile.isEmpty() && getenv("PARAVIEW_HELP")) + { diff --git a/paraview-3.2.1-install.patch b/paraview-3.2.1-install.patch new file mode 100644 index 0000000..66bb4da --- /dev/null +++ b/paraview-3.2.1-install.patch @@ -0,0 +1,78 @@ +--- ParaView3.2.1/Applications/Client/CMakeLists.txt.install 2007-11-19 16:02:42.000000000 -0700 ++++ ParaView3.2.1/Applications/Client/CMakeLists.txt 2007-11-20 09:14:25.000000000 -0700 +@@ -451,53 +451,6 @@ + COMPONENT Runtime) + ENDIF(NOT Q_WS_MAC) + +-# Install system libraries on Linux (will not work on any other Unix +-# yet) +-FOREACH(fmpglib avcodec avformat avutil) +- IF(FFMPEG_${fmpglib}_LIBRARY) +- GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH) +- GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME) +- FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*") +- INSTALL(CODE " +-MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${FFMPEG_LIB_NAME_tmp}\") +-EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp} +- COMMAND tar c ${FFMPEG_LIB_LIST} +- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}) +- " COMPONENT Runtime) +- #INSTALL(FILES ${FFMPEG_${fmpglib}_LIBRARY} DESTINATION ${PV_INSTALL_LIB_DIR_CM24}) +- +- ENDIF(FFMPEG_${fmpglib}_LIBRARY) +-ENDFOREACH(fmpglib) +- +-SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST) +-# the variable and library names are not the same +-IF (WIN32) +- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT) +-ELSE (WIN32) +- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT) +-ENDIF (WIN32) +- +-IF(NOT Q_WS_MAC) +- FOREACH(qtlib ${QTLIBLIST}) +- IF (NOT WIN32) +- #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24}) +- GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH) +- GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME) +- FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*") +- INSTALL(CODE " +-MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${QT_LIB_NAME_tmp}\") +-EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp} +- COMMAND tar c ${QT_LIB_LIST} +- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}) +- " COMPONENT Runtime) +- ELSE (NOT WIN32) +- GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH) +- INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime) +- ENDIF (NOT WIN32) +- +- ENDFOREACH(qtlib) +-ENDIF(NOT Q_WS_MAC) +- + # Hard-coded install rules for anything left to install. These should + # probably go to a local cmake file. Change to match the build system's + # libraries +@@ -510,21 +463,6 @@ + DESTINATION ${PV_EXE_INSTALL_CM24} + PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ + COMPONENT Runtime) +-ELSE(WIN32) +- IF (NOT Q_WS_MAC) +- IF(PV_NEED_SHARED_FORWARD) +- INSTALL(FILES ${QT_BINARY_DIR}/assistant +- DESTINATION ${PV_EXE_INSTALL_CM24} +- PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ +- COMPONENT Runtime +- RENAME assistant-real) +- ELSE(PV_NEED_SHARED_FORWARD) +- INSTALL(FILES ${QT_BINARY_DIR}/assistant +- DESTINATION ${PV_EXE_INSTALL_CM24} +- PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ +- COMPONENT Runtime) +- ENDIF(PV_NEED_SHARED_FORWARD) +- ENDIF (NOT Q_WS_MAC) + ENDIF(WIN32) + + # Call this one last so that it happens after the above targets are all installed: diff --git a/paraview-3.2.1-rpath.patch b/paraview-3.2.1-rpath.patch new file mode 100644 index 0000000..e09f778 --- /dev/null +++ b/paraview-3.2.1-rpath.patch @@ -0,0 +1,22 @@ +--- ParaView3.2/VTK/Common/Testing/Install/CMakeLists.txt.rpath 2007-11-19 11:12:52.000000000 -0700 ++++ ParaView3.2/VTK/Common/Testing/Install/CMakeLists.txt 2007-11-19 11:13:25.000000000 -0700 +@@ -5,7 +5,7 @@ + INCLUDE("${VTK_USE_FILE}") + INCLUDE_DIRECTORIES(${VIT_SOURCE_DIR}) + +- SET(CMAKE_SKIP_RPATH 1) ++ SET(CMAKE_SKIP_RPATH 0) + SET(VIT_FORWARD_DIR_BUILD ${VIT_BINARY_DIR}) + IF(CMAKE_CONFIGURATION_TYPES) + SET(VIT_FORWARD_CONFIG_PRE "CMAKE_INTDIR \"/\" ") +--- ParaView3.2/VTK/CMake/vtkSelectSharedLibraries.cmake.rpath 2007-11-19 11:12:35.000000000 -0700 ++++ ParaView3.2/VTK/CMake/vtkSelectSharedLibraries.cmake 2007-11-19 11:13:21.000000000 -0700 +@@ -51,7 +51,7 @@ + SET(CMAKE_SKIP_RPATH 0 CACHE INTERNAL "Whether to build with rpath." FORCE) + ELSE(VTK_USE_RPATH) + # We will not use rpath support. Tell CMake to skip it. +- SET(CMAKE_SKIP_RPATH 1 CACHE INTERNAL "Whether to build with rpath." FORCE) ++ SET(CMAKE_SKIP_RPATH 0 CACHE INTERNAL "Whether to build with rpath." FORCE) + ENDIF(VTK_USE_RPATH) + ENDIF(NOT WIN32) + ENDIF(NOT VTK_SHARED_LIBRARIES_SELECTED) diff --git a/paraview.spec b/paraview.spec index e5f2ce3..06bb25b 100644 --- a/paraview.spec +++ b/paraview.spec @@ -1,24 +1,25 @@ %{!?build_mpi:%define build_mpi 1} +%define pv_maj 3 +%define pv_min 2 +%define pv_patch 1 +%define pv_majmin %{pv_maj}.%{pv_min} Name: paraview -Version: 3.0.2 -Release: 2%{?dist} +Version: %{pv_majmin}.%{pv_patch} +Release: 1%{?dist} Summary: Parallel visualization application Group: Applications/Engineering License: BSD URL: http://www.paraview.org/ -# 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 +Source0: http://www.paraview.org/files/v%{pv_majmin}/paraview-%{version}.tar.gz Source1: paraview_22x22.png Source2: paraview.xml +Patch0: paraview-3.2-qt.patch +Patch1: paraview-3.2.1-rpath.patch +Patch2: paraview-3.2.1-install.patch +Patch3: paraview-3.2.1-doc.patch +Patch4: paraview-3.2.1-assistant-qt4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -31,7 +32,9 @@ BuildRequires: freetype-devel, libtiff-devel, zlib-devel BuildRequires: expat-devel BuildRequires: /usr/bin/desktop-file-install BuildRequires: doxygen, graphviz +BuildRequires: readline-devel Requires: %{name}-data = %{version}-%{release} +Requires: qt4-assistant Requires(post): /usr/bin/update-desktop-database Requires(postun): /usr/bin/update-desktop-database @@ -112,8 +115,12 @@ Requires: %{name}-mpi = %{version}-%{release} %prep -%setup -q -rm -rf Utilities/TclTk +%setup -q -n ParaView%{version} +%patch -p1 -b .qt +%patch1 -p1 -b .rpath +%patch2 -p1 -b .install +%patch3 -p1 -b .doc +%patch4 -p1 -b .assistant-qt4 %build @@ -134,7 +141,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \ -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \ -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ - -DVTK_USE_INFOVIS:BOOL=OFF \ + -DVTK_USE_INFOVIS:BOOL=OFF \ -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ @@ -167,7 +174,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS" -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_INFOVIS:BOOL=OFF \ -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \ -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ @@ -198,6 +205,10 @@ install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/mime/packages pushd fedora-mpi make install DESTDIR=$RPM_BUILD_ROOT +#ld.conf.d file +install -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d +echo %{_libdir}/paraview-mpi > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/paraview-mpi-%{_arch} + #Create desktop file cat > paraview-mpi.desktop < $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/paraview-%{_arch} + #Create desktop file cat > paraview.desktop < /dev/null ||: %postun +/sbin/ldconfig update-desktop-database &> /dev/null ||: %if %{build_mpi} %post mpi +/sbin/ldconfig update-desktop-database &> /dev/null ||: %postun mpi +/sbin/ldconfig update-desktop-database &> /dev/null ||: %endif @@ -291,28 +314,32 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files %defattr(-,root,root,-) %doc License_v1.1.txt +%{_sysconfdir}/ld.so.conf.d/paraview-%{_arch} %{_bindir}/paraview +%{_bindir}/pvbatch %{_bindir}/pvdataserver %{_bindir}/pvpython %{_bindir}/pvrenderserver %{_bindir}/pvserver %{_bindir}/pvTestDriver -%{_bindir}/vtkSMExtractDocumentation +%doc %{_datadir}/paraview/ %{_datadir}/applications/fedora-paraview.desktop %{_libdir}/paraview/ +%exclude %{_libdir}/paraview/doc/ %if %{build_mpi} %files mpi %defattr(-,root,root,-) %doc License_v1.1.txt +%{_sysconfdir}/ld.so.conf.d/paraview-mpi-%{_arch} %{_bindir}/paraview-mpi +%{_bindir}/pvbatch-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-mpi/ %endif @@ -326,15 +353,24 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files devel %defattr(-,root,root,-) -%{_includedir}/paraview-3.0/ +%{_includedir}/paraview-%{pv_majmin}/ +%doc %{_libdir}/paraview/doc/ %files mpi-devel %defattr(-,root,root,-) -%{_includedir}/paraview-3.0-mpi/ +%{_includedir}/paraview-%{pv_majmin}-mpi/ %changelog +* Mon Dec 03 2007 - Orion Poplawski - 3.2.1-1 +- Update to 3.2.1 +- Use macros for version numbers +- Add patches to fix documentation install location and use assistant-qt4, + not install copies of Qt libraries, and not use rpath. +- Install ld.so.conf.d file +- Fixup desktop files + * Thu Aug 23 2007 - Orion Poplawski - 3.0.2-2 - Update license tag to BSD - Fix make %%{_smp_mflags} diff --git a/sources b/sources index c6aa2ed..333d8e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3184bd889d1cc8c2d1efc7c8ed3e3759 paraview-3.0.2.tar.gz +050830112537c477a1cb20370caded50 paraview-3.2.1.tar.gz