rpms/paraview/devel paraview-3.2.1-assistant-qt4.patch, NONE, 1.1 paraview-3.2.1-doc.patch, NONE, 1.1 paraview-3.2.1-install.patch, NONE, 1.1 paraview-3.2.1-rpath.patch, NONE, 1.1 paraview.spec, 1.15, 1.16
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Thu Dec 6 18:30:38 UTC 2007
Author: orion
Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3971
Modified Files:
paraview.spec
Added Files:
paraview-3.2.1-assistant-qt4.patch paraview-3.2.1-doc.patch
paraview-3.2.1-install.patch paraview-3.2.1-rpath.patch
Log Message:
* Mon Dec 03 2007 - Orion Poplawski <orion at cora.wnra.com> - 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
paraview-3.2.1-assistant-qt4.patch:
--- NEW FILE paraview-3.2.1-assistant-qt4.patch ---
--- 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 = "\\..\\";
paraview-3.2.1-doc.patch:
--- NEW FILE paraview-3.2.1-doc.patch ---
--- 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"))
{
paraview-3.2.1-install.patch:
--- NEW FILE paraview-3.2.1-install.patch ---
--- 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:
paraview-3.2.1-rpath.patch:
--- NEW FILE paraview-3.2.1-rpath.patch ---
--- 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)
Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- paraview.spec 18 Nov 2007 20:13:05 -0000 1.15
+++ paraview.spec 6 Dec 2007 18:30:03 -0000 1.16
@@ -1,17 +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.2.1
+Version: %{pv_majmin}.%{pv_patch}
Release: 1%{?dist}
Summary: Parallel visualization application
Group: Applications/Engineering
License: BSD
URL: http://www.paraview.org/
-Source0: http://www.paraview.org/files/v3.2/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
@@ -24,7 +32,9 @@
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
@@ -107,6 +117,10 @@
%prep
%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
@@ -127,7 +141,7 @@
-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 \
@@ -160,7 +174,7 @@
-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 \
@@ -191,6 +205,10 @@
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 <<EOF
[Desktop Entry]
@@ -200,8 +218,8 @@
Comment=ParaView allows MPI enabled viewing of large data sets
Type=Application
Terminal=false
-Icon=paraview_22x22.png
-MimeType=application/x-paraview
+Icon=paraview_22x22
+MimeType=application/x-paraview;
Categories=Application;Graphics;
Exec=mpirun C paraview-mpi
EOF
@@ -220,14 +238,22 @@
mv $f ${f}-mpi
done
popd
-mv $RPM_BUILD_ROOT/%{_includedir}/paraview-3.0 $RPM_BUILD_ROOT/%{_includedir}/paraview-3.0-mpi
+mv $RPM_BUILD_ROOT/%{_includedir}/paraview-%{pv_majmin} $RPM_BUILD_ROOT/%{_includedir}/paraview-%{pv_majmin}-mpi
rm -rf $RPM_BUILD_ROOT%{_mandir}
+
+#Remove mpi copy of documentation
+rm -rf $RPM_BUID_ROOT%{_datadir}/paraview/Documentation-mpi
+rm -rf $RPM_BUID_ROOT%{_libdir}/paraview-mpi/doc
%endif
#Install the normal version
pushd fedora
make install DESTDIR=$RPM_BUILD_ROOT
+#ld.conf.d file
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
+echo %{_libdir}/paraview > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/paraview-%{_arch}
+
#Create desktop file
cat > paraview.desktop <<EOF
[Desktop Entry]
@@ -237,8 +263,8 @@
Comment=ParaView allows viewing of large data sets
Type=Application
Terminal=false
-Icon=paraview_22x22.png
-MimeType=application/x-paraview
+Icon=paraview_22x22
+MimeType=application/x-paraview;
Categories=Application;Graphics;
Exec=paraview
EOF
@@ -259,18 +285,22 @@
%post
+/sbin/ldconfig
update-desktop-database &> /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
@@ -284,28 +314,32 @@
%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
@@ -319,17 +353,23 @@
%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
-* Fri Nov 9 2007 - Orion Poplawski <orion at cora.wnra.com> - 3.2.1-1
+* Mon Dec 03 2007 - Orion Poplawski <orion at cora.wnra.com> - 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 <orion at cora.wnra.com> - 3.0.2-2
- Update license tag to BSD
More information about the fedora-extras-commits
mailing list