Hello community, here is the log from the commit of package paraview for openSUSE:Factory checked in at 2014-09-12 10:03:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-03-04 13:57:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.paraview.new/paraview.changes 2014-09-12 10:03:49.000000000 +0200 @@ -1,0 +2,27 @@ +Mon Sep 8 01:57:35 UTC 2014 - [email protected] + +- Update to version 4.2.0-RC1: + + See list of changes at + http://vtk.org/Bug/changelog_page.php?version_id=108 +- Packaging changes: + + Add paraview-desktop-entry-fix.patch to fix paraview's desktop + menu entry by properly inserting required key-value pairs + + Drop paraview-SciberQuestToolKit-install-path.patch; no longer + needed as properly implemented upstream + + Rebase carried-over patches to apply cleanly against present + version + + Add paraview-Mesa10.3-build-failures.patch to workaround + build failures when compiling against Mesa >= 10.3; patch + taken from upstream git and rebased; applied only for + openSUSE >= 13.2 + + Specfile changes: + - Prepare for gcc 4.9.0 by working around a compiler + issue + - Package .desktop entry and icon files; post(un) scriptlets + for updating hicolor icon theme and updating desktop menu + are used + - Package appdata file + - Fix python-bytecode-inconsistent-mtime rpmlint warnings by + recompiling all relevant .py files. + +------------------------------------------------------------------- Old: ---- ParaView-v4.1.0-source.tar.gz paraview-SciberQuestToolKit-install-path.patch New: ---- ParaView-v4.2.0-RC1-source.tar.gz paraview-Mesa10.3-build-failures.patch paraview-desktop-entry-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ paraview.spec ++++++ --- /var/tmp/diff_new_pack.lu5UAD/_old 2014-09-12 10:03:51.000000000 +0200 +++ /var/tmp/diff_new_pack.lu5UAD/_new 2014-09-12 10:03:51.000000000 +0200 @@ -16,22 +16,26 @@ # -%define major_ver 4.1 - +%define major_ver 4.2 +%define rc_ver 4.2.0-RC1 Name: paraview -Version: 4.1.0 +# This is the (only) RC release before version 4.2 is released +Version: 4.1.990 Release: 0 Summary: Data analysis and visualization application License: BSD-3-Clause Group: Productivity/Scientific/Physics Url: http://www.paraview.org -Source0: http://www.paraview.org/files/v%{major_ver}/ParaView-v%{version}-source.tar.gz -# PATCH-FIX-UPSTREAM paraview-default-qtstyle.patch [email protected] -- Make paraview inherit default qt gui look and feel, instead of using the Plastique theme +Source0: http://www.paraview.org/files/v%{major_ver}/ParaView-v%{rc_ver}-source.tar.gz +Source1: %{name}-rpmlintrc +# PATCH-FIX-OPENSUSE 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-desktop-entry-fix.patch [email protected] -- Fix desktop menu entry by inserting proper required categories +Patch1: paraview-desktop-entry-fix.patch # PATCH-FIX-UPSTREAM paraview-fix-file-contains-date-time.patch [email protected] -- Remove reference to __DATE__ and __TIME__ from source Patch2: paraview-fix-file-contains-date-time.patch +# PATCH-FIX-UPSTREAM paraview-Mesa10.3-build-failures.patch [email protected] -- Actually define GLX_GLXEXT_LEGACY to prevent the system glext.h include; fixes buld failures with Mesa >= 10.3; fix taken from upstream git and rebased +Patch3: paraview-Mesa10.3-build-failures.patch BuildRequires: Mesa-devel BuildRequires: boost-devel BuildRequires: cmake >= 2.8.8 @@ -110,12 +114,19 @@ %prep -%setup -q -n ParaView-v%{version} +%setup -q -n ParaView-v%{rc_ver}-source %patch0 -p1 %patch1 -p1 %patch2 -p1 +%if 0%{?suse_version} > 1310 +%patch3 -p1 +%endif %build +# Prepare for gcc 4.9.0: work around gcc 4.9.0 regression +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61294 +sed -i -e 's/-Wl,--fatal-warnings//' VTK/CMake/vtkCompilerExtras.cmake + export CC='gcc' export CXX='g++' export MAKE='make' @@ -167,12 +178,29 @@ popd rm -rf temp_dir/ +# FIX A BUNCH OF RPMLINT WARNINGS REGARDING python-bytecode-inconsistent-mtime +%py_compile %{buildroot}%{_libdir}/%{name}/site-packages/vtk/ +for i in `ls -d %{buildroot}%{_libdir}/%{name}/site-packages/vtk/*/`; +do + %py_compile $i/ +done + +%py_compile %{buildroot}%{_libdir}/%{name}/site-packages/paraview/vtk/util + %fdupes %{buildroot}/ -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +%icon_theme_cache_post +%desktop_database_post + %post -n %{name}-plugin-SciberQuestToolKit -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig +%icon_theme_cache_postun +%desktop_database_postun + %postun -n %{name}-plugin-SciberQuestToolKit -p /sbin/ldconfig %files @@ -182,6 +210,11 @@ %{_bindir}/* %{_datadir}/doc/%{name}-%{major_ver}/ %{_datadir}/%{name}/ +%dir %{_datadir}/appdata +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png + %exclude %{_libdir}/%{name}/libSciberQuestToolKit.so %files -n %{name}-plugin-SciberQuestToolKit ++++++ paraview-Mesa10.3-build-failures.patch ++++++ Index: ParaView-v4.2.0-RC1-source/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx =================================================================== --- ParaView-v4.2.0-RC1-source.orig/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx +++ ParaView-v4.2.0-RC1-source/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx @@ -26,7 +26,7 @@ // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by // the system -//#define GLX_GLXEXT_LEGACY +#define GLX_GLXEXT_LEGACY #include "GL/glx.h" #include "vtkgl.h" ++++++ paraview-default-qtstyle.patch ++++++ --- /var/tmp/diff_new_pack.lu5UAD/_old 2014-09-12 10:03:51.000000000 +0200 +++ /var/tmp/diff_new_pack.lu5UAD/_new 2014-09-12 10:03:51.000000000 +0200 @@ -1,9 +1,9 @@ -Index: ParaView-v4.1.0/CMake/branded_paraview_main.cxx.in +Index: ParaView-v4.2.0-RC1-source/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@[email protected]" +--- ParaView-v4.2.0-RC1-source.orig/CMake/branded_paraview_main.cxx.in ++++ ParaView-v4.2.0-RC1-source/CMake/branded_paraview_main.cxx.in +@@ -48,7 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + #endif #ifdef Q_WS_X11 -#include <QPlastiqueStyle> @@ -11,7 +11,7 @@ #endif #include <stdlib.h> -@@ -64,12 +64,12 @@ static bool checkenv(const char* vname) +@@ -72,12 +72,12 @@ static bool checkenv(const char* vname) int main(int argc, char* argv[]) { ++++++ paraview-desktop-entry-fix.patch ++++++ Index: ParaView-v4.2.0-RC1-source/Applications/ParaView/paraview.desktop.in =================================================================== --- ParaView-v4.2.0-RC1-source.orig/Applications/ParaView/paraview.desktop.in +++ ParaView-v4.2.0-RC1-source/Applications/ParaView/paraview.desktop.in @@ -1,7 +1,9 @@ [Desktop Entry] -Version=@PARAVIEW_VERSION_FULL@ Type=Application Name=ParaView Comment=Parallel visualization application TryExec=paraview +Exec=paraview Icon=paraview +Categories=Graphics;2DGraphics;3DGraphics; +StartupNotify=true ++++++ paraview-fix-file-contains-date-time.patch ++++++ --- /var/tmp/diff_new_pack.lu5UAD/_old 2014-09-12 10:03:51.000000000 +0200 +++ /var/tmp/diff_new_pack.lu5UAD/_new 2014-09-12 10:03:51.000000000 +0200 @@ -1,7 +1,7 @@ -Index: ParaView-v4.1.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c +Index: ParaView-v4.2.0-RC1-source/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c =================================================================== ---- ParaView-v4.1.0.orig/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c -+++ ParaView-v4.1.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c +--- ParaView-v4.2.0-RC1-source.orig/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c ++++ ParaView-v4.2.0-RC1-source/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c @@ -9,7 +9,7 @@ #include "ncdispatch.h" @@ -11,10 +11,10 @@ const char * nc_inq_libvers(void) -Index: ParaView-v4.1.0/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx +Index: ParaView-v4.2.0-RC1-source/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx =================================================================== ---- ParaView-v4.1.0.orig/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx -+++ ParaView-v4.1.0/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx +--- ParaView-v4.2.0-RC1-source.orig/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx ++++ ParaView-v4.2.0-RC1-source/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx @@ -438,7 +438,7 @@ void vtknifti1_io::nifti_disp_lib_hist( *//*--------------------------------------------------------------------*/ void vtknifti1_io::nifti_disp_lib_version( void ) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
