Hello community, here is the log from the commit of package gnuplot for openSUSE:Factory checked in at 2015-08-03 17:21:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnuplot (Old) and /work/SRC/openSUSE:Factory/.gnuplot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnuplot" Changes: -------- --- /work/SRC/openSUSE:Factory/gnuplot/gnuplot.changes 2015-05-30 12:33:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnuplot.new/gnuplot.changes 2015-08-03 17:21:44.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Jul 28 06:50:41 UTC 2015 - [email protected] + +- Add patch gnuplot-5.0.0-lua-5.3.1.dif to make it build with + lua-5.3.1 + +------------------------------------------------------------------- +Fri Jul 24 11:08:33 UTC 2015 - [email protected] + +- Require pkgconfig of libcerf at build time + +------------------------------------------------------------------- New: ---- gnuplot-5.0.0-lua-5.3.1.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnuplot.spec ++++++ --- /var/tmp/diff_new_pack.J9NjxM/_old 2015-08-03 17:21:45.000000000 +0200 +++ /var/tmp/diff_new_pack.J9NjxM/_new 2015-08-03 17:21:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnuplot # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ %bcond_without h3d_gridbox -%if %{suse_version} > 1310 +%if 0%{suse_version} > 1310 %define qtver 5 %else %define qtver 4 @@ -46,15 +46,18 @@ %else BuildRequires: libqt4-devel >= 4.5 %endif +%if 0%{?suse_version} > 1320 +BuildRequires: pkgconfig(libcerf) +%endif BuildRequires: latex2html BuildRequires: texlive-latex BuildRequires: texlive-tex4ht BuildRequires: texlive-ucs BuildRequires: zziplib -%if %suse_version >= 1220 +%if 0%{?suse_version} >= 1220 BuildRequires: makeinfo %endif -%if %suse_version > 1220 +%if 0%{?suse_version} > 1220 BuildRequires: texlive-dvips BuildRequires: texlive-epstopdf BuildRequires: texlive-tex @@ -67,7 +70,7 @@ BuildRequires: libpng-devel BuildRequires: lua-devel BuildRequires: plotutils-devel -%if 0%{?suse_version} > 0 && %{?suse_version} <= 1310 +%if 0%{?suse_version} > 0 && 0%{?suse_version} <= 1310 BuildRequires: wxWidgets-devel %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires @@ -100,6 +103,8 @@ Patch4: gnuplot-4.6.0-demo.diff Patch5: gnuplot-wx3.diff Patch6: gnuplot-QtCore-PIC.dif +# PATCH-FIX-SUSE -- make it build with lua-5.3.1 +Patch7: gnuplot-5.0.0-lua-5.3.1.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %if "%_exec_prefix" == "/usr/X11R6" @@ -127,7 +132,7 @@ Group: Productivity/Graphics/Visualization/Graph Requires: %{name} Requires(post): %install_info_prereq -Requires(postun): %install_info_prereq +Requires(preun): %install_info_prereq BuildArch: noarch %description doc @@ -150,6 +155,7 @@ %patch1 -p0 -b .x11ovf %patch5 -p1 -b .w3x %patch6 -p0 -b .pic +%patch7 -p0 -b .l531 %build autoreconf -fi @@ -263,7 +269,7 @@ %post doc %install_info --info-dir=.%{_infodir} .%{_infodir}/%{name}.info.gz -%postun doc +%preun doc %install_info_delete --info-dir=.%{_infodir} .%{_infodir}/%{name}.info.gz %files ++++++ gnuplot-5.0.0-lua-5.3.1.dif ++++++ --- term/lua.trm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- term/lua.trm +++ term/lua.trm 2015-07-28 06:48:03.890643983 +0000 @@ -251,7 +251,7 @@ LUA_GP_int_error(lua_State *L) { msg = luaL_checkstring(L, 1); break; case 2: - t_num = luaL_checkint(L, 1); + t_num = luaL_checkinteger(L, 1); msg = luaL_checkstring(L, 2); break; default: @@ -285,7 +285,7 @@ LUA_GP_int_warn(lua_State *L) { msg = luaL_checkstring(L, 1); break; case 2: - t_num = luaL_checkint(L, 1); + t_num = luaL_checkinteger(L, 1); msg = luaL_checkstring(L, 2); break; default:
