Hello community,
here is the log from the commit of package paraview for openSUSE:Factory checked in at 2014-02-04 19:56:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/paraview (Old)
and /work/SRC/openSUSE:Factory/.paraview.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "paraview"
Changes:
--------
--- /work/SRC/openSUSE:Factory/paraview/paraview.changes 2013-07-16 15:53:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.paraview.new/paraview.changes 2014-02-04 19:56:16.000000000 +0100
@@ -1,0 +2,19 @@
+Sun Feb 2 00:19:56 UTC 2014 - badshah400@gmail.com
+
+- Update to version 4.1.0:
+ + See list of changes at
+ http://vtk.org/Bug/changelog_page.php?version_id=102
+- Packaging changes:
+ + Use full URL for source tarball
+ + Drop patches:
+ - paraview-fix-vtkpython-modules-install-dir.patch: corrected
+ upstream
+ - paraview-no-return-in-nonvoid-function.patch: corrected
+ upstream
+ + Rebase existing patches
+ + Also fix a new occurrance of __DATE__ in a source file
+ within paraview-fix-file-contains-date-time.patch
+ + Change build type to RelWithDebInfo from Release
+ (DCMAKE_BUILD_TYPE=RelWithDebInfo).
+
+-------------------------------------------------------------------
Old:
----
ParaView-v4.0.1-source.tgz
paraview-fix-vtkpython-modules-install-dir.patch
paraview-no-return-in-nonvoid-function.patch
New:
----
ParaView-v4.1.0-source.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ paraview.spec ++++++
--- /var/tmp/diff_new_pack.ds0jiA/_old 2014-02-04 19:56:18.000000000 +0100
+++ /var/tmp/diff_new_pack.ds0jiA/_new 2014-02-04 19:56:18.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package paraview
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,26 +16,22 @@
#
-%define major_ver 4.0
+%define major_ver 4.1
Name: paraview
-Version: 4.0.1
+Version: 4.1.0
Release: 0
Summary: Data analysis and visualization application
License: BSD-3-Clause
Group: Productivity/Scientific/Physics
Url: http://www.paraview.org
-Source0: ParaView-v%{version}-source.tgz
+Source0: http://www.paraview.org/files/v%{major_ver}/ParaView-v%{version}-source.tar.gz
# PATCH-FIX-UPSTREAM paraview-default-qtstyle.patch badshah400@gmail.com -- Make paraview inherit default qt gui look and feel, instead of using the Plastique theme
Patch0: paraview-default-qtstyle.patch
# PATCH-FIX-UPSTREAM paraview-SciberQuestToolKit-install-path.patch badshah400@gmail.com -- Fix install path of SciberQuestToolkit plugin
Patch1: paraview-SciberQuestToolKit-install-path.patch
-# PATCH-FIX-UPSTREAM paraview-no-return-in-nonvoid-function.patch badshah400@gmail.com -- Fix a non-void function that returns no value
-Patch2: paraview-no-return-in-nonvoid-function.patch
-# PATCH-FIX-UPSTREAM paraview-fix-vtkpython-modules-install-dir.patch badshah400@gmail.com -- Workaround vtk's python modules getting installed in the wrong location
-Patch3: paraview-fix-vtkpython-modules-install-dir.patch
# PATCH-FIX-UPSTREAM paraview-fix-file-contains-date-time.patch badshah400@gmail.com -- Remove reference to __DATE__ and __TIME__ from source
-Patch4: paraview-fix-file-contains-date-time.patch
+Patch2: paraview-fix-file-contains-date-time.patch
BuildRequires: Mesa-devel
BuildRequires: boost-devel
BuildRequires: cmake >= 2.8.8
@@ -54,10 +50,8 @@
BuildRequires: python-devel
BuildRequires: python-matplotlib
%py_requires
-%if 0%{?suse_version} >= 1140
-BuildRequires: qt4-assistant-adp-devel
-%endif
BuildRequires: fdupes
+BuildRequires: qt4-assistant-adp-devel
BuildRequires: readline-devel
BuildRequires: tk-devel
BuildRequires: wget
@@ -113,12 +107,10 @@
%prep
-%setup -q -n ParaView-v%{version}-source
+%setup -q -n ParaView-v%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
export CC='gcc'
@@ -131,14 +123,17 @@
-DVTK_INSTALL_INCLUDE_DIR:PATH=include/%{name} \\\
-DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/%{name} \\\
-DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/%{name} \\\
+ -DVTK_INSTALL_DATA_DIR=%{_datadir}/%{name} \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\
-DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\
-DCMAKE_C_COMPILER:FILEPATH=$CC \\\
- -DCMAKE_BUILD_TYPE=Release \\\
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\
-DPARAVIEW_BUILD_QT_GUI:BOOL=ON \\\
-DPARAVIEW_QT_QMAKE_EXECUTABLE=%{_bindir}/qmake \\\
-DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=ON \\\
-DPARAVIEW_ENABLE_PYTHON:BOOL=ON \\\
+ -DVTK_WRAP_PYTHON:BOOL=ON \\\
+ -DVTK_WRAP_PYTHON_SIP:BOOL=ON \\\
-DVTK_OPENGL_HAS_OSMESA:BOOL=OFF \\\
-DVTK_USE_SYSTEM_EXPAT:BOOL=ON \\\
-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \\\
@@ -147,7 +142,8 @@
-DVTK_USE_SYSTEM_TIFF:BOOL=ON \\\
-DVTK_USE_SYSTEM_ZLIB:BOOL=ON \\\
-DBUILD_DOCUMENTATION:BOOL=ON \\\
- -DBUILD_EXAMPLES:BOOL=ON
+ -DBUILD_EXAMPLES:BOOL=ON \\\
+ -DBUILD_TESTING:BOOL=OFF
mkdir temp_dir
pushd temp_dir
@@ -165,10 +161,8 @@
%makeinstall DESTDIR=%{buildroot}
popd
rm -rf temp_dir/
-rm -rf /usr/src/packages/BUILD/ParaView-%{version}/temp_dir/Plugins/PointSprite/PointSpriteDemo
-%fdupes %{buildroot}%{_libdir}/%{name}/site-packages
-%fdupes %{buildroot}%{_libdir}/%{name}/www
+%fdupes %{buildroot}/
%post -p /sbin/ldconfig
%post -n %{name}-plugin-SciberQuestToolKit -p /sbin/ldconfig
@@ -182,6 +176,7 @@
%{_libdir}/%{name}/
%{_bindir}/*
%{_datadir}/doc/%{name}-%{major_ver}/
+%{_datadir}/%{name}/
%exclude %{_libdir}/%{name}/libSciberQuestToolKit.so
%files -n %{name}-plugin-SciberQuestToolKit
++++++ paraview-SciberQuestToolKit-install-path.patch ++++++
--- /var/tmp/diff_new_pack.ds0jiA/_old 2014-02-04 19:56:18.000000000 +0100
+++ /var/tmp/diff_new_pack.ds0jiA/_new 2014-02-04 19:56:18.000000000 +0100
@@ -1,13 +1,26 @@
-Index: ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt
+Index: ParaView-v4.1.0/Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt
===================================================================
---- ParaView-3.98.0-src.orig/Plugins/SciberQuestToolKit/CMakeLists.txt
-+++ ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt
-@@ -82,7 +82,7 @@ set (SQTK_VERSION "SQTK-${SQTK_RELEASE}
+--- ParaView-v4.1.0.orig/Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt
++++ ParaView-v4.1.0/Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt
+@@ -102,7 +102,7 @@ if(PARAVIEW_BUILD_QT_GUI)
+ LINK_PRIVATE pqComponents)
+ endif()
- # put the plugin inside the pv install
- set(SQTK_LIB_INSTALL_PATH
-- "${CMAKE_INSTALL_PREFIX}/lib/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}"
-+ "${PV_INSTALL_LIB_DIR}"
- )
- #message(STATUS "SQTK will be installed at ${SQTK_LIB_INSTALL_PATH}")
+-install(TARGETS SciberQuestToolKit DESTINATION lib/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR})
++install(TARGETS SciberQuestToolKit DESTINATION ${PV_INSTALL_LIB_DIR})
+ if(PARAVIEW_USE_MPI)
+ include(vtkMPI)
+Index: ParaView-v4.1.0/Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt
+===================================================================
+--- ParaView-v4.1.0.orig/Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt
++++ ParaView-v4.1.0/Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt
+@@ -162,7 +162,7 @@ if (SQTK_CUDA AND CUDA_FOUND)
+ LINK_PRIVATE ${CUDA_LIBRARIES})
+ endif()
+
+-install(TARGETS vtkSciberQuest DESTINATION lib/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR})
++install(TARGETS vtkSciberQuest DESTINATION ${PV_INSTALL_LIB_DIR})
+
+ if (BUILD_TESTING)
+ add_subdirectory(Testing)
++++++ paraview-default-qtstyle.patch ++++++
--- /var/tmp/diff_new_pack.ds0jiA/_old 2014-02-04 19:56:18.000000000 +0100
+++ /var/tmp/diff_new_pack.ds0jiA/_new 2014-02-04 19:56:18.000000000 +0100
@@ -1,7 +1,8 @@
-diff -ur ParaView-3.10.0.orig//CMake/branded_paraview_main.cxx.in ParaView-3.10.0//CMake/branded_paraview_main.cxx.in
---- ParaView-3.10.0.orig//CMake/branded_paraview_main.cxx.in 2011-03-10 00:01:13.000000000 +0530
-+++ ParaView-3.10.0//CMake/branded_paraview_main.cxx.in 2011-04-03 22:44:49.705998568 +0530
-@@ -40,19 +40,20 @@
+Index: ParaView-v4.1.0/CMake/branded_paraview_main.cxx.in
+===================================================================
+--- ParaView-v4.1.0.orig/CMake/branded_paraview_main.cxx.in
++++ ParaView-v4.1.0/CMake/branded_paraview_main.cxx.in
+@@ -40,7 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
#include "pq@BPC_NAME@Initializer.h"
#ifdef Q_WS_X11
@@ -9,20 +10,20 @@
+#include <QStyle>
#endif
- #include <clocale>
+ #include