Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2013-10-09 14:18:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plplot (Old) and /work/SRC/openSUSE:Factory/.plplot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plplot" Changes: -------- --- /work/SRC/openSUSE:Factory/plplot/plplot.changes 2013-08-21 15:09:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plplot.new/plplot.changes 2013-10-09 14:18:49.000000000 +0200 @@ -1,0 +2,35 @@ +Wed Oct 2 13:11:48 UTC 2013 - [email protected] + +- Update to version 5.9.10: + + The format for map data used by plmap has changed + + Python support for Numeric has been dropped + + Backwards-incompatible API change to non-integer line widths + + Improvements to the build system for the Cygwin case + + The plcolorbar API has been finalized + + Documentation of the new legend and color bar capabilities of + PLplot + + The D bindings and examples have been converted from the + old version of D (D1) to the new version of D (D2) + + The DocBook documentation for PLplot is now generated using + modern XML/XSL backend tools for DocBook + + Implement experimental build_projects sub-project + + Implement extremely simple "00" example + + Convert to using the Allura form of SourceForge software + + Use NON_TRANSITIVE linking by default for the shared libraries + case for all non-windows systems + + Update f95 examples to take larger advantage of Fortran 95 + capabilities + + Substantial additions to the doxygen documentation +- Packaging changes: + + Turn ada bindings back on + + Remove restriction on lua version used, since package now + builds with lua version >= 5.2 as well + + Turn off f77 bindings, as recommended by upstream + + Drop patches that have been incorporated upstream: + - plplot-multiarch.patch + - plplot-gcc-ada46-libs.patch + - plplot-strncat.patch +- Add plplot-lua-5_2.patch to replace usage of log10, deprecated + in lua 5.2, in favour of log(,10) in some lua based examples. + +------------------------------------------------------------------- Old: ---- plplot-5.9.9.tar.bz2 plplot-gcc-ada46-libs.patch plplot-multiarch.patch plplot-strncat.patch New: ---- plplot-5.9.10.tar.gz plplot-lua-5_2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.q3VmFh/_old 2013-10-09 14:18:50.000000000 +0200 +++ /var/tmp/diff_new_pack.q3VmFh/_new 2013-10-09 14:18:50.000000000 +0200 @@ -16,37 +16,32 @@ # +%if 0%{?suse_version} <= 1210 %define lua_version 5.1 +%else +%define lua_version 5.2 +%endif Name: plplot -Version: 5.9.9 +Version: 5.9.10 Release: 0 Summary: Cross-platform software package for creating scientific plots License: LGPL-2.1+ Group: Productivity/Scientific/Other Url: http://plplot.sourceforge.net/ -Source0: %{name}-%{version}.tar.bz2 +Source0: http://download.sf.net/plplot/%{name}-%{version}.tar.gz Source1: %{name}-rpmlintrc -# PATCH-FIX_UPSTREAM plplot-multiarch.patch [email protected] -- Enable install on multiple architectures -Patch0: plplot-multiarch.patch -# PATCH-FIX-UPSTREAM plplot-strncat.patch [email protected] -- Prevent overflow errors with strcat operations -Patch1: plplot-strncat.patch -# PATCH-FIX-UPSTREAM plplot-gcc-ada46-libs.patch [email protected] -- Allow searching for gcc-ada46 libraries -Patch2: plplot-gcc-ada46-libs.patch # PATCH-FIX-UPSTREAM plplot-5.9.9-ada-pic.patch [email protected] -- Compile Ada code with -fPIC -Patch3: plplot-5.9.9-ada-pic.patch +Patch1: plplot-5.9.9-ada-pic.patch # PATCH-FIX-UPSTREAM plplot-tcl-import-usage.patch [email protected] -- Fix type inconsistency for Tcl_Import for Tcl 8.6 -Patch4: plplot-tcl-import-usage.patch -BuildRequires: cmake +Patch2: plplot-tcl-import-usage.patch +# PATCH-FIX-UPSTREAM plplot-lua-5_2.patch [email protected] -- Replace usage of log10(), deprecated in lua 5.2, by log(,10) in lua based examples +Patch3: plplot-lua-5_2.patch +BuildRequires: cmake >= 2.8.9 BuildRequires: fdupes BuildRequires: freefont -#FIXME: Disable ada bindings as they cause failure in Factory -%if 0%{?suse_version} <= 1220 BuildRequires: gcc-ada -%endif BuildRequires: gcc-fortran -#jpeg, gif and png support with libgd has been deprecated from version 5.9.8 -#BuildRequires: gd-devel BuildRequires: itcl-devel BuildRequires: itk BuildRequires: java-devel @@ -55,7 +50,9 @@ BuildRequires: libqt4-devel BuildRequires: libtool BuildRequires: ncurses-devel +BuildRequires: ocaml BuildRequires: pkgconfig +BuildRequires: python-devel BuildRequires: python-numpy-devel BuildRequires: python-qt4-devel BuildRequires: swig @@ -67,10 +64,7 @@ BuildRequires: pkgconfig(libagg) BuildRequires: pkgconfig(libgnomeprintui-2.2) BuildRequires: pkgconfig(libgnomeui-2.0) -# Package does not build with lua > 5.1 -BuildRequires: ocaml -BuildRequires: python-devel -BuildRequires: pkgconfig(lua) < 5.2 +BuildRequires: pkgconfig(lua) BuildRequires: pkgconfig(pygtk-2.0) # Enable octave bindings for openSUSE 12.2 and higher %if 0%{?suse_version} >= 1210 @@ -504,12 +498,12 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 +%if 0%{?suse_version} >= 1310 %patch2 -p1 +%endif +%if 0%{?suse_version} >= 1220 %patch3 -p1 -%if 0%{?suse_version} >= 1310 -%patch4 -p1 %endif for file in NEWS README.release @@ -535,21 +529,16 @@ -DCMAKE_BUILD_TYPE:STRING=Release \\\ -DPL_FREETYPE_FONT_PATH:PATH="%{_datadir}/fonts/truetype" \\\ -DUSE_RPATH:BOOL=OFF \\\ -%if 0%{?suse_version} > 1220 - -DENABLE_ada:BOOL=OFF \\\ -%else -DENABLE_ada:BOOL=ON \\\ -%endif %if 0%{?suse_version} >= 1210 -DENABLE_octave:BOOL=ON \\\ %endif -DENABLE_d:BOOL=ON \\\ - -DENABLE_itcl:BOOL=ON \\\ - -DENABLE_itk:BOOL=ON \\\ + -DENABLE_itcl:BOOL=OFF \\\ + -DENABLE_itk:BOOL=OFF \\\ -DENABLE_tk:BOOL=ON \\\ -DPLD_ntk:BOOL=ON \\\ -DENABLE_ocaml:BOOL=ON \\\ - -DHAVE_PTHREAD:BOOL=ON \\\ -DPLD_aqt:BOOL=ON \\\ -DPLD_conex:BOOL=ON \\\ -DPLD_mskermit:BOOL=ON \\\ @@ -570,11 +559,6 @@ -DENABLE_lua:BOOL=ON \\\ .. -#Deprecated since 5.9.8 -# -DPLD_jpeg:BOOL=ON \\\ -# -DPLD_gif:BOOL=ON \\\ -# -DPLD_imp:BOOL=ON \\\ - make %{?_smp_mflags} popd @@ -610,6 +594,9 @@ #Grant executable permissions to example tk binaries with valid shebang chmod +x %{buildroot}%{_datadir}/%{name}%{version}/examples/tk/tk03 +#Remove a fortran static library +rm -fr %{buildroot}%{_libdir}/libplf95*.a + %fdupes %{buildroot}%{_datadir}/ %clean @@ -716,54 +703,38 @@ %{_datadir}/plplot%{version}/examples/test_diff.sh %{_mandir}/man3/pl*.3* -%if 0%{?suse_version} <= 1220 %files ada %defattr(-,root,root) %{_libdir}/libplplotadad.so.* -%endif -%if 0%{?suse_version} <= 1220 %files ada-devel %defattr(-,root,root) -%{_libdir}/libplplotadad.so %dir %{_libdir}/ada %dir %{_libdir}/ada/adalib %dir %{_datadir}/ada %dir %{_datadir}/ada/adainclude +%{_libdir}/libplplotadad.so %{_libdir}/ada/adalib/plplotadad/ %{_libdir}/pkgconfig/plplotd-ada.pc %{_datadir}/ada/adainclude/plplotadad/ %{_datadir}/plplot%{version}/examples/ada/ %{_datadir}/plplot%{version}/examples/test_ada.sh -%endif %files fortran %defattr(-,root,root) %{_libdir}/libplplotf95cd.so.* %{_libdir}/libplplotf95d.so.* -%{_libdir}/libplplotf77cd.so.* -%{_libdir}/libplplotf77d.so.* %files fortran-devel %defattr(-,root,root) %dir %{_libdir}/fortran -%dir %{_libdir}/fortran/include -%dir %{_libdir}/fortran/include/plplot %dir %{_libdir}/fortran/modules %dir %{_libdir}/fortran/modules/plplot -%{_libdir}/fortran/include/plplot/plplot_parameters.h -%{_libdir}/fortran/modules/plplot/plplot.mod -%{_libdir}/fortran/modules/plplot/plplot_flt.mod -%{_libdir}/fortran/modules/plplot/plplotp.mod -%{_libdir}/libplplotf77cd.so -%{_libdir}/libplplotf77d.so +%{_libdir}/fortran/modules/plplot/ %{_libdir}/libplplotf95cd.so %{_libdir}/libplplotf95d.so -%{_libdir}/pkgconfig/plplotd-f77.pc %{_libdir}/pkgconfig/plplotd-f95.pc -%{_datadir}/plplot%{version}/examples/f77/ %{_datadir}/plplot%{version}/examples/f95/ -%{_datadir}/plplot%{version}/examples/test_f77.sh %{_datadir}/plplot%{version}/examples/test_f95.sh %files lua ++++++ plplot-lua-5_2.patch ++++++ Index: plplot-5.9.10/examples/lua/x04.lua =================================================================== --- plplot-5.9.10.orig/examples/lua/x04.lua +++ plplot-5.9.10/examples/lua/x04.lua @@ -56,7 +56,7 @@ function plot1(type) for i=1, 101 do freql[i] = -2 + (i-1) / 20 freq = 10^freql[i] - ampl[i] = 20 * math.log10(1 / math.sqrt(1 + (freq / f0)^2)) + ampl[i] = 20 * math.log(1 / math.sqrt(1 + (freq / f0)^2),10) phase[i] = -(180 / math.pi) * math.atan(freq / f0) end Index: plplot-5.9.10/examples/lua/x26.lua =================================================================== --- plplot-5.9.10.orig/examples/lua/x26.lua +++ plplot-5.9.10/examples/lua/x26.lua @@ -106,7 +106,7 @@ function plot1(type, x_label, y_label, a for i = 1, 101 do freql[i] = -2 + (i-1)/20 freq = 10^freql[i] - ampl[i] = 20 * math.log10(1/math.sqrt(1+(freq/f0)^2)) + ampl[i] = 20 * math.log(1/math.sqrt(1+(freq/f0)^2),10) phase[i] = -180/math.pi*math.atan(freq/f0) end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
