rpms/paraview/F-7 paraview-3.2-qt.patch, NONE, 1.1 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 .cvsignore, 1.3, 1.4 paraview.spec, 1.12, 1.13 sources, 1.3, 1.4 paraview-2.4.2-tcltk.patch, 1.1, NONE paraview-2.4.3-png.patch, 1.1, NONE paraview-2.4.3-python.patch, 1.1, NONE paraview-2.4.4-cmake245.patch, 1.2, NONE paraview-2.4.4-const.patch, 1.1, NONE
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Sun Dec 9 14:38:23 UTC 2007
- Previous message (by thread): rpms/paraview/F-8 paraview-3.2-qt.patch, NONE, 1.1 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 .cvsignore, 1.4, 1.5 paraview.spec, 1.14, 1.15 sources, 1.4, 1.5
- Next message (by thread): rpms/perl-Test-AutoBuild/devel perl-Test-AutoBuild.spec,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/pkgs/rpms/paraview/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11119/F-7
Modified Files:
.cvsignore paraview.spec sources
Added Files:
paraview-3.2-qt.patch 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
Removed Files:
paraview-2.4.2-tcltk.patch paraview-2.4.3-png.patch
paraview-2.4.3-python.patch paraview-2.4.4-cmake245.patch
paraview-2.4.4-const.patch
Log Message:
-F devel/clog
paraview-3.2-qt.patch:
--- NEW FILE paraview-3.2-qt.patch ---
--- 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})
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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 15 Sep 2006 22:08:51 -0000 1.3
+++ .cvsignore 9 Dec 2007 14:37:45 -0000 1.4
@@ -1 +1 @@
-paraview-2.4.4.tar.gz
+paraview-3.2.1.tar.gz
Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-7/paraview.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- paraview.spec 9 Mar 2007 18:32:03 -0000 1.12
+++ paraview.spec 9 Dec 2007 14:37:45 -0000 1.13
@@ -1,34 +1,40 @@
-%{!?build_mpi:%define build_mpi 0}
+%{!?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: 2.4.4
-Release: 6%{?dist}
+Version: %{pv_majmin}.%{pv_patch}
+Release: 1%{?dist}
Summary: Parallel visualization application
Group: Applications/Engineering
-License: Distributable
+License: BSD
URL: http://www.paraview.org/
-Source0: http://www.paraview.org/files/v2.4/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-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
+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
%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
+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
@@ -75,11 +81,10 @@
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 +96,31 @@
%{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 demos
+%description devel
+%{summary}.
+
+
+%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
+%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
@@ -120,19 +132,16 @@
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 +150,8 @@
-DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
-DBUILD_DOCUMENTATION:BOOL=ON \
-DBUILD_EXAMPLES:BOOL=ON
-make
+cmake ..
+make VERBOSE=1 %{?_smp_mflags}
popd
%if %{build_mpi}
mkdir fedora-mpi
@@ -151,22 +161,20 @@
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 +183,8 @@
-DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
-DBUILD_DOCUMENTATION:BOOL=ON \
-DBUILD_EXAMPLES:BOOL=ON
-make
+cmake ..
+make VERBOSE=1 %{?_smp_mflags}
%endif
%install
@@ -195,11 +204,12 @@
# 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
+
+#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]
Encoding=UTF-8
@@ -208,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
@@ -221,20 +231,30 @@
popd
-#Move the mpi binaries out of the way
+#Move the mpi binaries, includes, and man pages out of the way
pushd $RPM_BUILD_ROOT/%{_bindir}
for f in *
do
mv $f ${f}-mpi
done
popd
+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
-install -m 755 bin/libvtkPVServerCommonPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4/
-install -m 755 bin/libvtkPVServerManagerPython.so $RPM_BUILD_ROOT%{_libdir}/paraview-2.4/
+
+#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]
Encoding=UTF-8
@@ -243,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
@@ -256,8 +276,8 @@
popd
-# 'cmake' does not set +x permissions for libraries; hence they won't be stripped
-find $RPM_BUILD_ROOT%_libdir -name \*.so | xargs chmod +x
+#Don't ship the VTK Qt Designer plugin
+rm -r $RPM_BUILD_ROOT/usr/plugins
%clean
@@ -265,21 +285,25 @@
%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
-
%post data
update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -289,48 +313,76 @@
%files
%defattr(-,root,root,-)
-%doc Copyright.txt README.html
+%doc License_v1.1.txt
+%{_sysconfdir}/ld.so.conf.d/paraview-%{_arch}
%{_bindir}/paraview
%{_bindir}/pvbatch
-%{_bindir}/pvclient
%{_bindir}/pvdataserver
%{_bindir}/pvpython
%{_bindir}/pvrenderserver
%{_bindir}/pvserver
+%{_bindir}/pvTestDriver
+%doc %{_datadir}/paraview/
%{_datadir}/applications/fedora-paraview.desktop
-%{_libdir}/paraview-2.4/
+%{_libdir}/paraview/
+%exclude %{_libdir}/paraview/doc/
%if %{build_mpi}
%files mpi
%defattr(-,root,root,-)
-%doc Copyright.txt README.html
+%doc License_v1.1.txt
+%{_sysconfdir}/ld.so.conf.d/paraview-mpi-%{_arch}
%{_bindir}/paraview-mpi
%{_bindir}/pvbatch-mpi
-%{_bindir}/pvclient-mpi
%{_bindir}/pvdataserver-mpi
%{_bindir}/pvpython-mpi
%{_bindir}/pvrenderserver-mpi
%{_bindir}/pvserver-mpi
+%{_bindir}/pvTestDriver-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-%{pv_majmin}/
+%doc %{_libdir}/paraview/doc/
+
+
+%files mpi-devel
+%defattr(-,root,root,-)
+%{_includedir}/paraview-%{pv_majmin}-mpi/
%changelog
+* 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
+- Fix make %%{_smp_mflags}
+- Rebuild for ppc32
+
+* Wed Jul 11 2007 - Orion Poplawski <orion at cora.wnra.com> - 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 <orion at cora.wnra.com> - 2.4.4-6
- Don't build mpi version until upstream fixes the build system
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 15 Sep 2006 22:08:51 -0000 1.3
+++ sources 9 Dec 2007 14:37:45 -0000 1.4
@@ -1 +1 @@
-7f8e926542268546563e8e8c1d4ad852 paraview-2.4.4.tar.gz
+050830112537c477a1cb20370caded50 paraview-3.2.1.tar.gz
--- paraview-2.4.2-tcltk.patch DELETED ---
--- paraview-2.4.3-png.patch DELETED ---
--- paraview-2.4.3-python.patch DELETED ---
--- paraview-2.4.4-cmake245.patch DELETED ---
--- paraview-2.4.4-const.patch DELETED ---
- Previous message (by thread): rpms/paraview/F-8 paraview-3.2-qt.patch, NONE, 1.1 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 .cvsignore, 1.4, 1.5 paraview.spec, 1.14, 1.15 sources, 1.4, 1.5
- Next message (by thread): rpms/perl-Test-AutoBuild/devel perl-Test-AutoBuild.spec,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list