Hello community, here is the log from the commit of package paraview for openSUSE:Factory checked in at 2013-07-16 15:53:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-20 21:26:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.paraview.new/paraview.changes 2013-07-16 15:53:44.000000000 +0200 @@ -1,0 +2,23 @@ +Mon Jul 8 04:49:03 UTC 2013 - [email protected] + +- 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. + +------------------------------------------------------------------- Old: ---- ParaView-3.98.1-source.tar.gz paraview-fix-build-with-system-jpeg.patch New: ---- ParaView-v4.0.1-source.tgz paraview-fix-file-contains-date-time.patch paraview-fix-vtkpython-modules-install-dir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ paraview.spec ++++++ --- /var/tmp/diff_new_pack.3BX7Jp/_old 2013-07-16 15:53:46.000000000 +0200 +++ /var/tmp/diff_new_pack.3BX7Jp/_new 2013-07-16 15:53:46.000000000 +0200 @@ -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 -Release: 1 -License: BSD-3-Clause +Version: 4.0.1 +Release: 0 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 [email protected] -- 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 [email protected] -- Fix install path of SciberQuestToolkit plugin Patch1: paraview-SciberQuestToolKit-install-path.patch # PATCH-FIX-UPSTREAM paraview-no-return-in-nonvoid-function.patch [email protected] -- Fix a non-void function that returns no value -Patch3: paraview-no-return-in-nonvoid-function.patch -# PATCH-FIX-UPSTREAM paraview-fix-build-with-system-jpeg.patch [email protected] -- Fix build errors when compiling with new libjpeg; patch came from upstream -Patch4: paraview-fix-build-with-system-jpeg.patch +Patch2: paraview-no-return-in-nonvoid-function.patch +# PATCH-FIX-UPSTREAM paraview-fix-vtkpython-modules-install-dir.patch [email protected] -- 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 [email protected] -- 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: 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: graphviz Requires: python Requires: python-base +Requires: python-matplotlib BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -107,15 +113,12 @@ %prep -%setup -q -n ParaView-%{version}-source +%setup -q -n ParaView-v%{version}-source %patch0 -p1 %patch1 -p1 +%patch2 -p1 %patch3 -p1 -%patch4 -p0 -# GCC 4.7 only available for openSUSE > 12.1 -#%if 0%{?suse_version} > 1210 -#%patch2 -p1 -#%endif +%patch4 -p1 %build export CC='gcc' @@ -124,7 +127,10 @@ 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 @@ -DVTK_USE_SYSTEM_TIFF:BOOL=ON \\\ -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \\\ -DBUILD_DOCUMENTATION: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} + -DBUILD_EXAMPLES:BOOL=ON 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 @@ 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 @@ %{_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) ++++++ paraview-fix-file-contains-date-time.patch ++++++ 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 ++++++ 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}) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
