Accepting request 182960 from home:badshah400:branches:science

Update to version 4.0.1

OBS-URL: https://build.opensuse.org/request/show/182960
OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=19

ParaView-3.98.1-source.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b7dbc4c513d7e3eb4a41b8d6365e75bddf8c40d8bfb9c17fa080304a981cf844
-size 43595288

ParaView-v4.0.1-source.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e04fcc085ee0305a163d9b6a66904fbb21e6a3fac69b275395c5ffc106e48e2
+size 47827831

paraview-fix-build-with-system-jpeg.patch

@@ -1,53 +0,0 @@
-commit 1d79220a5a9cad512a2ed980c85b3f67b1b25573
-Author: Nikhil Shetty <nikhil.shetty@kitware.com>
-Date:   Tue Feb 19 10:02:26 2013 -0500
-
-    Fix to use newer libjpeg API.
-    
-    Newer API uses jMemSrc instead of jpeg_mem_src. We check if the version
-    is  >=80 or or  MEM_SRCDST_SUPPORTED is defined and use the newer API
-    where appropriate.
-    
-    Change-Id: I89d1129c656539a3e748fbbebae5130aece6e4c1
-
-diff --git VTK/IO/Image/vtkJPEGReader.cxx VTK/IO/Image/vtkJPEGReader.cxx
-index db3c0da..9604952 100644
---- VTK/IO/Image/vtkJPEGReader.cxx
-+++ VTK/IO/Image/vtkJPEGReader.cxx
-@@ -92,7 +92,11 @@ extern "C" void skip_input_data (j_decompress_ptr cinfo, long num_bytes)
- }
- 
- // Read JPEG image from a memory buffer
-+#if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
-+extern "C" void jMemSrc (j_decompress_ptr cinfo, void* buffer, long nbytes)
-+#else
- extern "C" void jpeg_mem_src (j_decompress_ptr cinfo, void* buffer, long nbytes)
-+#endif
- {
-   cinfo->src = (struct jpeg_source_mgr *)
-       (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-@@ -184,7 +188,11 @@ void vtkJPEGReader::ExecuteInformation()
-     }
-   else
-     {
-+#if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
-+    jMemSrc(&cinfo, this->MemoryBuffer, this->MemoryBufferLength);
-+#else
-     jpeg_mem_src(&cinfo, this->MemoryBuffer, this->MemoryBufferLength);
-+#endif
-     }
- 
-   // read the header
-@@ -264,7 +272,11 @@ int vtkJPEGReaderUpdate2(vtkJPEGReader *self, OT *outPtr,
-     }
-   else
-     {
-+#if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
-+    jMemSrc(&cinfo, self->GetMemoryBuffer(), self->GetMemoryBufferLength());
-+#else
-     jpeg_mem_src(&cinfo, self->GetMemoryBuffer(), self->GetMemoryBufferLength());
-+#endif
-     }
- 
-   // read the header
-

paraview-fix-file-contains-date-time.patch

@@ -0,0 +1,13 @@
+Index: ParaView-v4.0.1-source/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
+===================================================================
+--- ParaView-v4.0.1-source.orig/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
++++ ParaView-v4.0.1-source/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
+@@ -9,7 +9,7 @@
+ #include "ncdispatch.h"
+ 
+ /* Tell the user the version of netCDF. */
+-static const char nc_libvers[] = PACKAGE_VERSION " of "__DATE__" "__TIME__" $";
++static const char nc_libvers[] = PACKAGE_VERSION;
+ 
+ const char *
+ nc_inq_libvers(void)

paraview-fix-vtkpython-modules-install-dir.patch

@@ -0,0 +1,13 @@
+Index: ParaView-v4.0.1-source/CMakeLists.txt
+===================================================================
+--- ParaView-v4.0.1-source.orig/CMakeLists.txt
++++ ParaView-v4.0.1-source/CMakeLists.txt
+@@ -176,7 +176,7 @@ set (VTK_INSTALL_NO_QT_PLUGIN TRUE)
+ 
+ # ParaView install the vtk python modules specifically to appropriate locations.
+ set (VTK_INSTALL_NO_PYTHON TRUE)
+-set (VTK_INSTALL_PYTHON_USING_CMAKE TRUE)
++set (VTK_INSTALL_PYTHON_USING_CMAKE FALSE)
+ 
+ # for temporary backwards compatibility.
+ set (PV_INSTALL_BIN_DIR ${VTK_INSTALL_RUNTIME_DIR})

paraview.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon Jul  8 04:49:03 UTC 2013 - badshah400@gmail.com
+
+- Update to version 4.0.1:
+  + Undocumented upstream changes
+- Changes from version 4.0:
+  + Too many to list, see
+    http://paraview.org/Bug/changelog_page.php?version_id=52
+    for a complete list
+- Drop paraview-fix-build-with-system-jpeg.patch; implemented
+  upstream
+- Use matplotlib during building to enable MathText rendering;
+  introduces build time and runtime requirement on
+  python-matplotlib
+- Add patches:
+  + paraview-fix-vtkpython-modules-install-dir.patch: Workaround
+    vtk's python modules getting installed in the wrong location;
+    upstream bug report at
+    http://paraview.org/Bug/view.php?id=14168
+  + paraview-fix-file-contains-date-time.patch: Remove reference
+    to __DATE__ and __TIME__ from source files
+- Use fdupes to link duplicated files.
+
 -------------------------------------------------------------------
 Thu Jun 20 05:05:52 UTC 2013 - badshah400@gmail.com
 

paraview.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package
+# spec file for package paraview
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -15,24 +15,27 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define major_ver 3.98
+
+%define major_ver 4.0
 
 Name:           paraview
-Version:        3.98.1
+Version:        4.0.1
-Release:        1
+Release:        0
-License:        BSD-3-Clause
 Summary:        Data analysis and visualization application
-Url:            http://www.paraview.org
+License:        BSD-3-Clause
 Group:          Productivity/Scientific/Physics
-Source0:        ParaView-%{version}-source.tar.gz
+Url:            http://www.paraview.org
+Source0:        ParaView-v%{version}-source.tgz
 # 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 
-Patch3:         paraview-no-return-in-nonvoid-function.patch
+Patch2:         paraview-no-return-in-nonvoid-function.patch
-# PATCH-FIX-UPSTREAM paraview-fix-build-with-system-jpeg.patch badshah400@gmail.com -- Fix build errors when compiling with new libjpeg; patch came from upstream
+# PATCH-FIX-UPSTREAM paraview-fix-vtkpython-modules-install-dir.patch badshah400@gmail.com -- Workaround vtk's python modules getting installed in the wrong location
-Patch4:         paraview-fix-build-with-system-jpeg.patch
+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
 BuildRequires:  Mesa-devel
 BuildRequires:  boost-devel
 BuildRequires:  cmake >= 2.8.8
@@ -43,16 +46,18 @@ BuildRequires:  graphviz
 BuildRequires:  libexpat-devel
 BuildRequires:  libjpeg-devel
 #BuildRequires:  libpq5
+BuildRequires:  libQtWebKit-devel
 BuildRequires:  libpqxx-devel
 BuildRequires:  libqt4-devel >= 4.7.0
-BuildRequires:  libQtWebKit-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  openssl-devel
 BuildRequires:  python-devel
+BuildRequires:  python-matplotlib
 %py_requires
 %if 0%{?suse_version} >= 1140
 BuildRequires:  qt4-assistant-adp-devel
 %endif
+BuildRequires:  fdupes
 BuildRequires:  readline-devel
 BuildRequires:  tk-devel
 BuildRequires:  wget
@@ -61,6 +66,7 @@ Requires:       gnuplot
 Requires:       graphviz
 Requires:       python
 Requires:       python-base
+Requires:       python-matplotlib
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -107,15 +113,12 @@ This package provides the SciberQuestToolKit plugin for paraview.
 
 
 %prep
-%setup -q -n ParaView-%{version}-source
+%setup -q -n ParaView-v%{version}-source
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
-%patch4 -p0
+%patch4 -p1
-# GCC 4.7 only available for openSUSE > 12.1
-#%if 0%{?suse_version} > 1210
-#%patch2 -p1
-#%endif
 
 %build
 export CC='gcc'
@@ -124,7 +127,10 @@ export MAKE='make'
 export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
 %define paraview_cmake_options \\\
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix}\\\
+        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
+        -DVTK_INSTALL_INCLUDE_DIR:PATH=include/%{name} \\\
+        -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/%{name} \\\
+        -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/%{name} \\\
         -DBUILD_SHARED_LIBS:BOOL=ON \\\
         -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\
         -DCMAKE_C_COMPILER:FILEPATH=$CC \\\
@@ -141,15 +147,12 @@ export CXXFLAGS="%{optflags}"
         -DVTK_USE_SYSTEM_TIFF:BOOL=ON \\\
         -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \\\
         -DBUILD_DOCUMENTATION:BOOL=ON \\\
-        -DBUILD_EXAMPLES:BOOL=ON \\\
+        -DBUILD_EXAMPLES:BOOL=ON
-        -DVTK_INSTALL_INCLUDE_DIR:PATH=include/%{name} \\\
-        -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/%{name} \\\
-        -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/%{name}
 
 mkdir temp_dir
 pushd temp_dir
 cmake .. \
-        -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview \
+        -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/%{name} \
         %{paraview_cmake_options}
 
 make %{?_smp_mflags}
@@ -159,11 +162,14 @@ popd
 find . \( -name \*.txt -o -name \*.xml -o -name '*.[ch]' -o -name '*.[ch][px][px]' \) -print0 | xargs -0 chmod -x
 
 pushd temp_dir
-%makeinstall
+%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
+
 %post -p /sbin/ldconfig
 %post -n %{name}-plugin-SciberQuestToolKit -p /sbin/ldconfig
 
@@ -177,8 +183,6 @@ rm -rf /usr/src/packages/BUILD/ParaView-%{version}/temp_dir/Plugins/PointSprite/
 %{_bindir}/*
 %{_datadir}/doc/%{name}-%{major_ver}/
 %exclude %{_libdir}/%{name}/libSciberQuestToolKit.so
-#%dir %{_includedir}/%{name}-%{major_ver}
-#%{_includedir}/%{name}-%{major_ver}/vtkhdf5/
 
 %files -n %{name}-plugin-SciberQuestToolKit
 %defattr(-,root,root)