From 6618e379e9e5b8f2c559c2d65b074bc6bd4511e275975d41c46bc428f1443f9a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 24 Jul 2015 11:34:04 +0000 Subject: [PATCH 1/2] . OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=69 --- gnuplot.changes | 5 +++++ gnuplot.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gnuplot.changes b/gnuplot.changes index f39b2d4..cb08d67 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 24 11:08:33 UTC 2015 - werner@suse.de + +- Require pkgconfig of libcerf at build time + ------------------------------------------------------------------- Fri May 22 07:07:22 UTC 2015 - werner@suse.de diff --git a/gnuplot.spec b/gnuplot.spec index 7e40f2a..ff0e9be 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -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 @@ -46,6 +46,9 @@ BuildRequires: pkgconfig(Qt5Svg) %else BuildRequires: libqt4-devel >= 4.5 %endif +%if %suse_version > 1320 +BuildRequires: pkgconfig(libcerf) +%endif BuildRequires: latex2html BuildRequires: texlive-latex BuildRequires: texlive-tex4ht @@ -127,7 +130,7 @@ Summary: Documentation of GNUplot 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 @@ -263,7 +266,7 @@ autoreconf -fi %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 From c05407c011bb2277d49e89a5655bfc1e28c7d5f14d8d9c2202e6568f411fc6b1 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 28 Jul 2015 06:55:24 +0000 Subject: [PATCH 2/2] . OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=70 --- gnuplot-5.0.0-lua-5.3.1.dif | 24 ++++++++++++++++++++++++ gnuplot.changes | 6 ++++++ gnuplot.spec | 13 ++++++++----- 3 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 gnuplot-5.0.0-lua-5.3.1.dif diff --git a/gnuplot-5.0.0-lua-5.3.1.dif b/gnuplot-5.0.0-lua-5.3.1.dif new file mode 100644 index 0000000..532d006 --- /dev/null +++ b/gnuplot-5.0.0-lua-5.3.1.dif @@ -0,0 +1,24 @@ +--- + 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: diff --git a/gnuplot.changes b/gnuplot.changes index cb08d67..9d6bcdd 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 28 06:50:41 UTC 2015 - werner@suse.de + +- 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 - werner@suse.de diff --git a/gnuplot.spec b/gnuplot.spec index ff0e9be..6572fee 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -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,7 +46,7 @@ BuildRequires: pkgconfig(Qt5Svg) %else BuildRequires: libqt4-devel >= 4.5 %endif -%if %suse_version > 1320 +%if 0%{?suse_version} > 1320 BuildRequires: pkgconfig(libcerf) %endif BuildRequires: latex2html @@ -54,10 +54,10 @@ 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 @@ -70,7 +70,7 @@ BuildRequires: fdupes 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 @@ -103,6 +103,8 @@ Patch2: gnuplot-4.6.0-fonts.diff 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" @@ -153,6 +155,7 @@ cp %{_sourcedir}/picins.sty docs %patch1 -p0 -b .x11ovf %patch5 -p1 -b .w3x %patch6 -p0 -b .pic +%patch7 -p0 -b .l531 %build autoreconf -fi