rpms/paraview/devel paraview-3.6.0-assistant-qt4.patch, 1.1, 1.2 paraview-3.6.1-plugins.patch, 1.1, 1.2 paraview.spec, 1.41, 1.42 paraview-3.6.1-cmake-install-prefix.patch, 1.1, NONE
Orion Poplawski
orion at fedoraproject.org
Fri Aug 28 14:54:56 UTC 2009
Author: orion
Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27365
Modified Files:
paraview-3.6.0-assistant-qt4.patch
paraview-3.6.1-plugins.patch paraview.spec
Removed Files:
paraview-3.6.1-cmake-install-prefix.patch
Log Message:
* Thu Aug 27 2009 Orion Poplawski <orion at cora.nwra.com> - 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
paraview-3.6.0-assistant-qt4.patch:
Applications/OverView/Core/MainWindow.cxx | 2 +-
Qt/Components/pqClientMainWindow.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: paraview-3.6.0-assistant-qt4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview-3.6.0-assistant-qt4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- paraview-3.6.0-assistant-qt4.patch 23 Jul 2009 19:29:42 -0000 1.1
+++ paraview-3.6.0-assistant-qt4.patch 28 Aug 2009 14:54:56 -0000 1.2
@@ -5,7 +5,7 @@
QString profileFile;
- const char* assistantName = "assistant";
-+ const char* assistantName = "assistant-qt4";
++ const char* assistantName = "assistant_adp";
#if defined(Q_WS_WIN)
const char* binDir = "\\";
const char* binDir1 = "\\..\\";
@@ -16,7 +16,7 @@
QString profileFile;
- const char* assistantName = "assistant";
-+ const char* assistantName = "assistant-qt4";
++ const char* assistantName = "assistant_adp";
#if defined(Q_WS_WIN)
const char* extString = ".exe";
const char* binDir = "\\";
paraview-3.6.1-plugins.patch:
ParaViewPlugins.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: paraview-3.6.1-plugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview-3.6.1-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- paraview-3.6.1-plugins.patch 23 Jul 2009 19:29:42 -0000 1.1
+++ paraview-3.6.1-plugins.patch 28 Aug 2009 14:54:56 -0000 1.2
@@ -5,7 +5,7 @@
IF (PV_INSTALL_BIN_DIR)
INSTALL(TARGETS ${name}
- DESTINATION "${PV_INSTALL_BIN_DIR}/plugins/${name}"
-+ DESTINATION "${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/plugins/${name}"
++ DESTINATION "${PV_INSTALL_LIB_DIR}/plugins/${name}"
COMPONENT Runtime)
ENDIF (PV_INSTALL_BIN_DIR)
ENDMACRO(internal_paraview_install_plugin)
Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- paraview.spec 26 Aug 2009 16:15:34 -0000 1.41
+++ paraview.spec 28 Aug 2009 14:54:56 -0000 1.42
@@ -6,7 +6,7 @@
Name: paraview
Version: %{pv_majmin}.%{pv_patch}
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Parallel visualization application
Group: Applications/Engineering
@@ -15,14 +15,12 @@ URL: http://www.paraview.org/
Source0: http://www.paraview.org/files/v%{pv_majmin}/paraview-%{version}.tar.gz
Source1: paraview_22x22.png
Source2: paraview.xml
-#Fixup some install locations
-#Reported upstream: http://public.kitware.com/mantis/view.php?id=9301
-Patch1: paraview-3.6.1-cmake-install-prefix.patch
#Don't try to copy Qt libraries into paraview directory
Patch2: paraview-3.6.0-install.patch
#Move pqClient.adp into %{_datadir}/paraview
Patch3: paraview-3.6.1-doc.patch
-#Look for assistant-qt4 instead of assistant
+#Reported upstream: http://public.kitware.com/Bug/view.php?id=9458
+#Look for assistant_adp instead of assistant
Patch4: paraview-3.6.0-assistant-qt4.patch
#Reported upstream: http://public.kitware.com/Bug/view.php?id=7022
#Installs PointSpriteDemo into incorrect location, remove install for now
@@ -182,7 +180,6 @@ BuildArch: noarch
%prep
%setup -q -n ParaView3
-%patch1 -p1 -b .cmake-install-prefix
%patch2 -p1 -b .install
%patch3 -p1 -b .doc
%patch4 -p1 -b .assistant-qt4
@@ -204,7 +201,7 @@ export MAKE='make'
export CFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
%cmake .. \
- -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview \
+ -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview \
%{paraview_cmake_options}
##Need to run cmake twice to get MPI headers into VTK/Parallel build config
cmake ..
@@ -219,7 +216,7 @@ export MAKE='make'
export CFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
export CXXFLAGS="$RPM_OPT_FLAGS -DH5_USE_16_API"
%cmake .. \
- -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview-mpi \
+ -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview-mpi \
-DPARAVIEW_USE_MPI:BOOL=ON \
-DICET_BUILD_TESTING:BOOL=ON \
-DMPI_COMPILER:FILEPATH=%{_libdir}/openmpi/$(pkg-config --modversion openmpi)/bin/mpicxx \
@@ -249,10 +246,11 @@ install -m644 %SOURCE2 $RPM_BUILD_ROOT%{
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
#Cleanup %{_bindir}
pushd $RPM_BUILD_ROOT/%{_bindir}
-#Don't ship copy of Qt assisstant
-rm $RPM_BUILD_ROOT%{_bindir}/assistant
#Don't need mpi versions of these
rm -f lproj paraview pvblot pvpython pvTestDriver vtkSMExtractDocumentation
#Move the remaining mpi binaries out of the way
@@ -267,10 +265,6 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/pa
rm -rf $RPM_BUILD_ROOT%{_mandir}
#rm -r $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/{doc,Documentation,pqClient.adp}
popd
-
-#Move some stuff to the proper location
-mv $RPM_BUILD_ROOT/%{_lib}/paraview-mpi/* $RPM_BUILD_ROOT%{_libdir}/paraview-mpi/
-rm -r $RPM_BUILD_ROOT/%{_lib}/paraview-mpi
%endif
#Install the normal version
@@ -303,16 +297,13 @@ popd
rm -r $RPM_BUILD_ROOT/usr/plugins
#Don't ship copy of Qt assisstant
-rm $RPM_BUILD_ROOT%{_bindir}/assistant
+rm -f $RPM_BUILD_ROOT%{_bindir}/assistant \
+ $RPM_BUILD_ROOT%{_libdir}/paraview/assistant-real
#Move the documentation
#mv $RPM_BUILD_ROOT%{_libdir}/paraview/{Documentation,pqClient.adp} \
# $RPM_BUILD_ROOT%{_datadir}/paraview/
-#Move some stuff to the proper location
-mv $RPM_BUILD_ROOT/%{_lib}/paraview/* $RPM_BUILD_ROOT%{_libdir}/paraview/
-rm -r $RPM_BUILD_ROOT/%{_lib}/paraview
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -386,6 +377,10 @@ update-mime-database %{_datadir}/mime &>
%changelog
+* Thu Aug 27 2009 Orion Poplawski <orion at cora.nwra.com> - 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
+
* Wed Aug 26 2009 Orion Poplawski <orion at cora.nwra.com> - 3.6.1-4
- Disable building various plugins that need OverView
--- paraview-3.6.1-cmake-install-prefix.patch DELETED ---
More information about the fedora-extras-commits
mailing list