Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2017-12-02 13:12:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plplot (Old) and /work/SRC/openSUSE:Factory/.plplot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plplot" Sat Dec 2 13:12:12 2017 rev:46 rq:547107 version:5.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/plplot/plplot.changes 2017-10-05 12:06:07.914577166 +0200 +++ /work/SRC/openSUSE:Factory/.plplot.new/plplot.changes 2017-12-02 13:12:14.510938771 +0100 @@ -1,0 +2,29 @@ +Fri Dec 1 10:08:56 UTC 2017 - [email protected] + +- Switch to using explicit python3 BuildRequires (plplot is + "unresolvable" for openSUSE <= 1320 anyway); adapt file lists + accordingly. +- Drop conditionals referring to old openSUSE versions <= 1320. + +------------------------------------------------------------------- +Fri Dec 1 08:26:44 UTC 2017 - [email protected] + +- Drop legacy dependencies: pkgconfig(gnome-python-2.0) and + pkgconfig(pygtk-2.0) are not in use. + +------------------------------------------------------------------- +Wed Nov 29 08:20:50 UTC 2017 - [email protected] + +- Fix License tag in specfile for plplot-octave subpackage: While + everything else is licensed as LGPL-2.1+, the Octave bindings + are licensed as GPL-2.0+. + +------------------------------------------------------------------- +Sat Nov 11 22:51:26 UTC 2017 - [email protected] + +- Drop BuildRequires on libgnomui and libgnomeprintui, as they are + not really required any more (boo#1067727). +- Change hashbangs for python based examples so that they refer + directly to the python binary instead of doing so via env. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.RjdDG7/_old 2017-12-02 13:12:15.554900748 +0100 +++ /var/tmp/diff_new_pack.RjdDG7/_new 2017-12-02 13:12:15.558900601 +0100 @@ -47,7 +47,8 @@ Version: 5.13.0 Release: 0 Summary: Software package for creating scientific plots -License: LGPL-2.1+ +# Main license is LGPL-2.1+, but Octave bindings are licensed as GPL-2.0+ +License: LGPL-2.1+ and GPL-2.0+ Group: Productivity/Scientific/Other Url: http://plplot.sourceforge.net/ Source0: http://download.sf.net/plplot/%{name}-%{version}.tar.gz @@ -66,9 +67,9 @@ BuildRequires: ncurses-devel BuildRequires: ocaml BuildRequires: pkgconfig -BuildRequires: python-devel -BuildRequires: python-numpy-devel -BuildRequires: python-qt5-devel +BuildRequires: python3-devel +BuildRequires: python3-numpy-devel +BuildRequires: python3-qt5-devel BuildRequires: qhull-devel BuildRequires: shapelib BuildRequires: swig @@ -82,26 +83,14 @@ BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pangoft2) # Required for enabling tk driverand in the %%check section, currently disabled +BuildRequires: hdf5-devel +BuildRequires: octave-devel +BuildRequires: wxWidgets-devel >= 3 BuildRequires: xorg-x11-server BuildRequires: perl(XML::DOM) BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(gnome-python-2.0) -BuildRequires: pkgconfig(libgnomeprintui-2.2) -BuildRequires: pkgconfig(libgnomeui-2.0) -BuildRequires: pkgconfig(lua) -BuildRequires: pkgconfig(pygtk-2.0) -%if 0%{?suse_version} >= 1310 BuildRequires: pkgconfig(lasi) -%endif -BuildRequires: hdf5-devel -BuildRequires: octave-devel -%if 0%{?suse_version} >= 1320 -BuildRequires: wxWidgets-devel >= 3 -%else -BuildRequires: wxWidgets-devel -%define _use_internal_dependency_generator 0 -%define __find_requires %wx_requires -%endif +BuildRequires: pkgconfig(lua) Requires: libtool Requires: python-base = %{py_ver} @@ -138,6 +127,7 @@ %package common ########################################################################## Summary: Files for development with PLplot +License: LGPL-2.1+ Group: Productivity/Graphics/Visualization/Graph Provides: %{name} = %{version} Obsoletes: %{name} < 5.12.0 @@ -173,6 +163,7 @@ %package devel ########################################################################## Summary: Files for development with PLplot +License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: %{c_shlib} = %{version} Requires: %{csirocsa_shlib} = %{version} @@ -245,6 +236,7 @@ %package doc ########################################################################## Summary: Documentation for PLplot and its bindings +License: LGPL-2.1+ Group: Documentation/Other %description doc @@ -263,6 +255,7 @@ %package -n %{ada_shlib} ########################################################################## Summary: Shared libraries for PLplot's Ada bindings +License: LGPL-2.1+ Group: System/Libraries %description -n %{ada_shlib} @@ -284,6 +277,7 @@ %package -n %{name}ada-devel ########################################################################## Summary: Ada bindings for development with PLplot +License: LGPL-2.1+ Group: Development/Languages/Other Requires: %{ada_shlib} = %{version} Requires: %{name}-common = %{version} @@ -315,6 +309,7 @@ %package -n %{fort_shlib} ########################################################################## Summary: Shared libraries for PLplot's Fortran bindings +License: LGPL-2.1+ Group: System/Libraries %description -n %{fort_shlib} @@ -336,6 +331,7 @@ %package -n %{name}fortran-devel ########################################################################## Summary: Fortran bindings for development with PLplot +License: LGPL-2.1+ Group: Development/Languages/Fortran Requires: %{fort_shlib} = %{version} Requires: %{name}-common = %{version} @@ -366,6 +362,7 @@ %package java ########################################################################## Summary: PLplot functions for scientific plotting with Java +License: LGPL-2.1+ Group: Productivity/Scientific/Other Requires: %{name}-common = %{version} Requires: java @@ -388,6 +385,7 @@ %package lua ########################################################################## Summary: PLplot functions for scientific plotting with Lua +License: LGPL-2.1+ Group: Development/Libraries/Other Requires: %{name}-common = %{version} Requires: lua @@ -409,6 +407,7 @@ %package octave ########################################################################## Summary: PLplot functions for scientific plotting with Octave +License: GPL-2.0+ Group: Development/Libraries/Other Requires: %{name}-common = %{version} Requires: octave @@ -434,6 +433,7 @@ %package python-qt ########################################################################## Summary: PLplot functions for scientific plotting with python-qt4 +License: LGPL-2.1+ Group: Development/Libraries/Python Requires: %{name}-common = %{version} Requires: python-base = %{py_ver} @@ -448,12 +448,13 @@ %files python-qt %defattr(-,root,root) -%{python_sitearch}/plplot_pyqt5.so +%{python3_sitearch}/plplot_pyqt5.so ########################################################################## %package -n %{qt_shlib} ########################################################################## Summary: PLplot functions for scientific plotting with Qt +License: LGPL-2.1+ Group: System/Libraries %description -n %{qt_shlib} @@ -475,6 +476,7 @@ %package -n %{name}qt-devel ########################################################################## Summary: PLplot functions for scientific plotting with qt +License: LGPL-2.1+ Group: Development/Libraries/Other Requires: %{qt_shlib} = %{version} Requires: libqt4-devel @@ -501,6 +503,7 @@ %package tcltk-libs ########################################################################## Summary: PLplot functions for scientific plotting with Tcl/Tk +License: LGPL-2.1+ Group: System/Libraries Provides: %{name}-tcltk = %{version} Obsoletes: %{name}-tcltk < 5.12.0 @@ -525,6 +528,7 @@ %package tcltk-devel ########################################################################## Summary: PLplot functions for scientific plotting with Tcl/Tk +License: LGPL-2.1+ Group: Development/Libraries/Other Requires: %{name}-common = %{version} Requires: %{name}-tcltk-libs = %{version} @@ -556,14 +560,14 @@ %if %{tk_enabled} %{_bindir}/plserver -%{python_sitearch}/Plframe.py* -%{python_sitearch}/TclSup.py* %{_datadir}/plplot%{version}/examples/tk/ %{_libdir}/plplot%{version}/drivers/tk.driver_info %{_libdir}/plplot%{version}/drivers/tk.so %{_libdir}/plplot%{version}/drivers/tkwin.driver_info %{_libdir}/plplot%{version}/drivers/tkwin.so -%{python_sitearch}/*Pltk_init.* +%{python3_sitearch}/Plframe.py* +%{python3_sitearch}/TclSup.py* +%{python3_sitearch}/*Pltk_init.* %endif ########################################################################## @@ -571,6 +575,7 @@ %package -n %{wx_shlib} ########################################################################## Summary: PLplot functions for scientific plotting with wxWidgets +License: LGPL-2.1+ Group: System/Libraries %description -n %{wx_shlib} @@ -592,6 +597,7 @@ %package wxwidgets ########################################################################## Summary: PLplot plot viewer built on wxWidgets +License: LGPL-2.1+ Group: Productivity/Graphics/Visualization/Graph Requires: %{name}-common = %{version} Requires: %{wx_shlib} = %{version} @@ -610,6 +616,7 @@ %package -n %{name}wxwidgets-devel ########################################################################## Summary: PLplot bindings for development with wxWidgets +License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} Requires: %{wx_shlib} = %{version} @@ -637,6 +644,7 @@ %package -n %{c_shlib} ########################################################################## Summary: PLplot functions for scientific plotting with C +License: LGPL-2.1+ Group: System/Libraries %description -n %{c_shlib} @@ -657,6 +665,7 @@ %package -n %{cxx_shlib} ########################################################################## Summary: PLplot functions for scientific plotting with C++ +License: LGPL-2.1+ Group: System/Libraries %description -n %{cxx_shlib} @@ -677,6 +686,7 @@ %package -n plplotcxx-devel ########################################################################## Summary: PLplot functions for scientific plotting with C++ +License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: %{cxx_shlib} = %{version} Requires: %{name}-common = %{version} @@ -697,6 +707,7 @@ %package -n %{csirocsa_shlib} ########################################################################## Summary: PLplot csirocsa component +License: LGPL-2.1+ Group: System/Libraries %description -n %{csirocsa_shlib} @@ -717,6 +728,7 @@ %package -n %{csironn_shlib} ########################################################################## Summary: PLplot csironn component +License: LGPL-2.1+ Group: System/Libraries %description -n %{csironn_shlib} @@ -737,6 +749,7 @@ %package -n %{qsastime_shlib} ########################################################################## Summary: PLplot qsatime component +License: LGPL-2.1+ Group: System/Libraries %description -n %{qsastime_shlib} @@ -757,6 +770,7 @@ %package -n python-%{name} ########################################################################## Summary: PLplot functions for scientific plotting with Python +License: LGPL-2.1+ Group: System/Libraries Requires: %{name}-common = %{version} @@ -768,9 +782,12 @@ %files -n python-%{name} %defattr(-,root,root) -%{python_sitearch}/_plplotc.so -%{python_sitearch}/plplot.py* -%{python_sitearch}/plplotc.py* +%{python3_sitearch}/_plplotc.so +%{python3_sitearch}/plplot.py* +%{python3_sitearch}/plplotc.py* +%{python3_sitearch}/_plplotc.so +%{python3_sitearch}/plplot.py* +%{python3_sitearch}/plplotc.py* %{_datadir}/plplot%{version}/examples/python/ %{_datadir}/plplot%{version}/examples/test_python.sh ########################################################################## @@ -778,6 +795,7 @@ %package driver-cairo ########################################################################## Summary: PLplot driver using the cairo backend +License: LGPL-2.1+ Group: System/Libraries Requires: plplot-common = %{version} @@ -796,6 +814,7 @@ %package driver-ntk ########################################################################## Summary: PLplot driver using the ntk backend +License: LGPL-2.1+ Group: System/Libraries Requires: plplot-common = %{version} @@ -814,6 +833,7 @@ %package driver-ps ########################################################################## Summary: PLplot driver using the ps backend +License: LGPL-2.1+ Group: System/Libraries Requires: plplot-common = %{version} @@ -832,6 +852,7 @@ %package driver-psttf ########################################################################## Summary: PLplot driver using the psttf backend +License: LGPL-2.1+ Group: System/Libraries Requires: plplot-common = %{version} @@ -850,6 +871,7 @@ %package driver-svg ########################################################################## Summary: PLplot driver using the SVG backend +License: LGPL-2.1+ Group: System/Libraries Requires: plplot-common = %{version} @@ -868,6 +890,7 @@ %package driver-xfig ########################################################################## Summary: PLplot driver using the xfig backend +License: LGPL-2.1+ Group: System/Libraries Requires: plplot-common = %{version} @@ -886,6 +909,7 @@ %package driver-xwin ########################################################################## Summary: PLplot driver using the xwin backend +License: LGPL-2.1+ Group: System/Libraries Requires: plplot-common = %{version} @@ -913,11 +937,7 @@ done %build -%if 0%{?suse_version} >= 1310 export CFLAGS="%{optflags} -DUSE_INTERP_RESULT -fno-strict-aliasing" -%else -export CFLAGS="%{optflags} -fno-strict-aliasing" -%endif export CXXFLAGS="%{optflags} -fno-strict-aliasing" export FFLAGS="%{optflags}" export LDFLAGS="-fPIC" @@ -1004,6 +1024,11 @@ #Remove a fortran static library rm %{buildroot}%{_libdir}/libplfortrandemolib*.a +#Fix python hashbangs for examples (/usr/bin/env python -> /usr/bin/python) +sed -i "1{s/\/usr\/bin\/env python/\/usr\/bin\/python/;}" %{buildroot}%{_datadir}/%{name}%{version}/examples/python/x* +sed -i "1{s/\/usr\/bin\/env python/\/usr\/bin\/python/;}" %{buildroot}%{_datadir}/%{name}%{version}/examples/python/*.py +sed -i "1{s/\/usr\/bin\/env python/\/usr\/bin\/python/;}" %{buildroot}%{_datadir}/%{name}%{version}/examples/python/pytkdemo + %fdupes %{buildroot}%{_datadir}/ %check
