Accepting request 346925 from home:NicoK:branches:Publishing

update to 5.0.1 * please also re-enable for Leap OBS-URL: https://build.opensuse.org/request/show/346925 OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=72
2015-12-01 05:07:00 +00:00 · 2015-12-01 05:07:00 +00:00 · 1b18d967cb
commit 1b18d967cb
parent c05407c011
6 changed files with 137 additions and 51 deletions
--- a/gnuplot-4.6.0.dif
+++ b/gnuplot-4.6.0.dif
@ -1,7 +1,7 @@
-diff -upr ../gnuplot-5.0.0.orig/configure.in ./configure.in
--- ../gnuplot-5.0.0.orig/configure.in	2014-12-06 07:23:29.000000000 +0100
-+++ ./configure.in	2015-01-21 19:43:16.398390320 +0100
-@@ -369,7 +369,7 @@ if test "$with_linux_vga" = yes; then
+diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/configure.in gnuplot-5.0.1.new/configure.in
+--- gnuplot-5.0.1.orig/configure.in	2015-05-19 01:07:16.000000000 +0200
+++ gnuplot-5.0.1.new/configure.in	2015-12-01 00:49:17.507692991 +0100
+@@ -369,7 +369,7 @@
     [AC_DEFINE(LINUXVGA,1,
                [ Define if this is a Linux system with SuperVGA library. ])
      LINUXSUID='chown root $(bindir)/gnuplot; chmod u+s $(bindir)/gnuplot'
@ -10,9 +10,9 @@ diff -upr ../gnuplot-5.0.0.orig/configure.in ./configure.in
     with_linux_vga=no)
 fi
 
-diff -upr ../gnuplot-5.0.0.orig/docs/Makefile.am ./docs/Makefile.am
--- ../gnuplot-5.0.0.orig/docs/Makefile.am	2014-10-01 04:36:59.000000000 +0200
-+++ ./docs/Makefile.am	2015-01-21 19:43:16.399390320 +0100
+diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/docs/Makefile.am gnuplot-5.0.1.new/docs/Makefile.am
+--- gnuplot-5.0.1.orig/docs/Makefile.am	2015-05-03 00:22:33.000000000 +0200
+++ gnuplot-5.0.1.new/docs/Makefile.am	2015-12-01 01:24:55.097654431 +0100
@@ -38,7 +38,7 @@
 #
 
@ -22,16 +22,16 @@ diff -upr ../gnuplot-5.0.0.orig/docs/Makefile.am ./docs/Makefile.am
 gihdir = @GIHDIR@
 
 noinst_PROGRAMS = checkdoc doc2ipf doc2tex doc2gih doc2rnh doc2hlp \
-@@ -86,7 +86,7 @@ gnuplot.ms doc2rnh gnuplot.rnh doc2rtf g
+@@ -86,7 +86,7 @@
 checkdoc gnuplot.txt gnuplot.tmp VERSION gnuplot.4tc gnuplot.4ct	\
- gnuplot.idv gnuplot.xref gnuplot.lg figures pdffigures.*		\
+ gnuplot.idv gnuplot.xref gnuplot.lg figures pdffigures.aux		\
 wxhelp/*.html wxhelp/wgnuplot.htc windows/wgnuplot.htk gnuplot.pdf	\
 -gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS)
 +gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS) gnuplot-fr.gih
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(DOCHEADERS) $(EXTRA_DIST)
 
-@@ -268,16 +268,20 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/
+@@ -270,16 +270,20 @@
 doc2hlp_SOURCES = doc2hlp.c termdoc.c
 
 ### gnuplot interactive help format
@ -54,16 +54,16 @@ diff -upr ../gnuplot-5.0.0.orig/docs/Makefile.am ./docs/Makefile.am
 
 alldoc2gih_SOURCES = doc2gih.c termdoc.c
 alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS)
-diff -upr ../gnuplot-5.0.0.orig/docs/Makefile.in ./docs/Makefile.in
--- ../gnuplot-5.0.0.orig/docs/Makefile.in	2015-01-01 20:27:52.000000000 +0100
-+++ ./docs/Makefile.in	2015-01-21 19:43:16.400390321 +0100
+diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/docs/Makefile.in gnuplot-5.0.1.new/docs/Makefile.in
+--- gnuplot-5.0.1.orig/docs/Makefile.in	2015-06-07 17:20:29.000000000 +0200
+++ gnuplot-5.0.1.new/docs/Makefile.in	2015-12-01 01:24:32.578385309 +0100
@@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.14 from Makefile.am.
 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -406,7 +406,7 @@ top_builddir = @top_builddir@
+@@ -406,7 +406,7 @@
 top_srcdir = @top_srcdir@
 
 # default is what is needed for interactive gnuplot
@ -72,16 +72,16 @@ diff -upr ../gnuplot-5.0.0.orig/docs/Makefile.in ./docs/Makefile.in
 gihdir = @GIHDIR@
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/term
 T = $(top_srcdir)/term/
-@@ -446,7 +446,7 @@ gnuplot.ms doc2rnh gnuplot.rnh doc2rtf g
+@@ -446,7 +446,7 @@
 checkdoc gnuplot.txt gnuplot.tmp VERSION gnuplot.4tc gnuplot.4ct	\
- gnuplot.idv gnuplot.xref gnuplot.lg figures pdffigures.*		\
+ gnuplot.idv gnuplot.xref gnuplot.lg figures pdffigures.aux		\
 wxhelp/*.html wxhelp/wgnuplot.htc windows/wgnuplot.htk gnuplot.pdf	\
 -gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS)
 +gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS) gnuplot-fr.gih
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(DOCHEADERS) $(EXTRA_DIST)
 BUILT_SOURCES = allterm.h
-@@ -1042,14 +1042,18 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/
+@@ -1044,14 +1044,18 @@
 	./doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.hlp
 
 ### gnuplot interactive help format
@ -102,10 +102,10 @@ diff -upr ../gnuplot-5.0.0.orig/docs/Makefile.in ./docs/Makefile.in
 
 ### wxhelp format
 htb: gnuplot.htb
-diff -upr ../gnuplot-5.0.0.orig/docs/gnuplot-fr.doc ./docs/gnuplot-fr.doc
--- ../gnuplot-5.0.0.orig/docs/gnuplot-fr.doc	2015-01-21 19:31:33.000000000 +0100
-+++ ./docs/gnuplot-fr.doc	2015-01-21 19:59:22.858479689 +0100
-@@ -436,8 +436,8 @@ C
+diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/docs/gnuplot-fr.doc gnuplot-5.0.1.new/docs/gnuplot-fr.doc
+--- gnuplot-5.0.1.orig/docs/gnuplot-fr.doc	2015-12-01 00:39:35.048785014 +0100
+++ gnuplot-5.0.1.new/docs/gnuplot-fr.doc	2015-12-01 00:49:17.511692953 +0100
+@@ -436,8 +436,8 @@
 #Home      & same as \verb~^A~. \\
 #Ctrl Home & same as \verb~^E~. \\
 #Esc       & same as \verb~^U~. \\
@ -116,10 +116,10 @@ diff -upr ../gnuplot-5.0.0.orig/docs/gnuplot-fr.doc ./docs/gnuplot-fr.doc
 %c l .
 %Touche fléchée@Fonction
 %_
-diff -upr ../gnuplot-5.0.0.orig/src/gadgets.h ./src/gadgets.h
--- ../gnuplot-5.0.0.orig/src/gadgets.h	2014-07-14 19:06:00.000000000 +0200
-+++ ./src/gadgets.h	2015-01-21 19:44:18.308396045 +0100
-@@ -470,7 +470,7 @@ extern TBOOLEAN	clip_lines1;
+diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/gadgets.h gnuplot-5.0.1.new/src/gadgets.h
+--- gnuplot-5.0.1.orig/src/gadgets.h	2015-03-29 19:47:03.000000000 +0200
+++ gnuplot-5.0.1.new/src/gadgets.h	2015-12-01 00:49:17.511692953 +0100
+@@ -473,7 +473,7 @@
 extern TBOOLEAN	clip_lines2;
 extern TBOOLEAN	clip_points;
 
@ -128,10 +128,10 @@ diff -upr ../gnuplot-5.0.0.orig/src/gadgets.h ./src/gadgets.h
 extern int samples_1;
 extern int samples_2;
 
-diff -upr ../gnuplot-5.0.0.orig/src/gplt_x11.c ./src/gplt_x11.c
--- ../gnuplot-5.0.0.orig/src/gplt_x11.c	2014-12-15 05:24:07.000000000 +0100
-+++ ./src/gplt_x11.c	2015-01-21 19:55:05.112455855 +0100
-@@ -2515,9 +2515,12 @@ exec_cmd(plot_struct *plot, char *comman
+diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/gplt_x11.c gnuplot-5.0.1.new/src/gplt_x11.c
+--- gnuplot-5.0.1.orig/src/gplt_x11.c	2015-12-01 00:48:21.452198467 +0100
+++ gnuplot-5.0.1.new/src/gplt_x11.c	2015-12-01 00:49:17.511692953 +0100
+@@ -2524,9 +2524,12 @@
 	}
     }
     /*   X11_justify_text(mode) - set text justification mode  */
@ -147,10 +147,10 @@ diff -upr ../gnuplot-5.0.0.orig/src/gplt_x11.c ./src/gplt_x11.c
     else if (*buffer == 'A')
 	sscanf(buffer + 1, "%lf", &plot->angle);
 
-diff -upr ../gnuplot-5.0.0.orig/src/plot.c ./src/plot.c
--- ../gnuplot-5.0.0.orig/src/plot.c	2014-12-31 05:32:09.000000000 +0100
-+++ ./src/plot.c	2015-01-21 19:49:19.917423935 +0100
-@@ -216,6 +216,7 @@ static int asked_privi = 0;
+diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/plot.c gnuplot-5.0.1.new/src/plot.c
+--- gnuplot-5.0.1.orig/src/plot.c	2014-12-31 05:32:09.000000000 +0100
+++ gnuplot-5.0.1.new/src/plot.c	2015-12-01 00:49:17.511692953 +0100
+@@ -216,6 +216,7 @@
 void
 drop_privilege()
 {
@ -158,7 +158,7 @@ diff -upr ../gnuplot-5.0.0.orig/src/plot.c ./src/plot.c
     if (!asked_privi) {
 	euid = geteuid();
 	egid = getegid();
-@@ -229,11 +230,13 @@ drop_privilege()
+@@ -229,11 +230,13 @@
     if (seteuid(ruid) == -1)
 	(void) fprintf(stderr, "seteuid(%d): %s\n",
 		       (int) ruid, strerror(errno));
@ -172,7 +172,7 @@ diff -upr ../gnuplot-5.0.0.orig/src/plot.c ./src/plot.c
     if (!asked_privi) {
 	euid = geteuid();
 	egid = getegid();
-@@ -247,6 +250,7 @@ take_privilege()
+@@ -247,6 +250,7 @@
     if (seteuid(euid) == -1)
 	(void) fprintf(stderr, "seteuid(%d): %s\n",
 		       (int) euid, strerror(errno));
@ -180,7 +180,7 @@ diff -upr ../gnuplot-5.0.0.orig/src/plot.c ./src/plot.c
 }
 
 #endif /* LINUXVGA */
-@@ -273,8 +277,8 @@ main(int argc, char **argv)
+@@ -273,8 +277,8 @@
     int i;
 
 #ifdef LINUXVGA
@ -190,7 +190,7 @@ diff -upr ../gnuplot-5.0.0.orig/src/plot.c ./src/plot.c
 #endif
 /* make sure that we really have revoked root access, this might happen if
    gnuplot is compiled without vga support but is installed suid by mistake */
-@@ -329,6 +333,22 @@ main(int argc, char **argv)
+@@ -329,6 +333,22 @@
     rl_getc_function = getc_wrapper;
 #endif
 
@ -213,9 +213,9 @@ diff -upr ../gnuplot-5.0.0.orig/src/plot.c ./src/plot.c
 #if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE)
     /* T.Walter 1999-06-24: 'rl_readline_name' must be this fix name.
      * It is used to parse a 'gnuplot' specific section in '~/.inputrc'
-diff -upr ../gnuplot-5.0.0.orig/src/term.h ./src/term.h
--- ../gnuplot-5.0.0.orig/src/term.h	2014-10-01 04:40:29.000000000 +0200
-+++ ./src/term.h	2015-01-21 19:49:50.522426765 +0100
+diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/src/term.h gnuplot-5.0.1.new/src/term.h
+--- gnuplot-5.0.1.orig/src/term.h	2014-10-01 04:40:29.000000000 +0200
+++ gnuplot-5.0.1.new/src/term.h	2015-12-01 00:49:17.511692953 +0100
@@ -261,9 +261,9 @@
 #include "emf.trm"
 
@ -237,10 +237,10 @@ diff -upr ../gnuplot-5.0.0.orig/src/term.h ./src/term.h
 
 /* Frame Maker MIF 3.00 format driver */
 #ifdef HAVE_MIF
-diff -upr ../gnuplot-5.0.0.orig/term/linux.trm ./term/linux.trm
--- ../gnuplot-5.0.0.orig/term/linux.trm	2012-01-30 20:31:01.000000000 +0100
-+++ ./term/linux.trm	2015-01-21 19:50:41.692431497 +0100
-@@ -195,7 +195,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO(
+diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/term/linux.trm gnuplot-5.0.1.new/term/linux.trm
+--- gnuplot-5.0.1.orig/term/linux.trm	2012-01-30 20:31:01.000000000 +0100
+++ gnuplot-5.0.1.new/term/linux.trm	2015-12-01 00:49:17.511692953 +0100
+@@ -195,7 +195,7 @@
 TERM_PUBLIC void LINUX_move __PROTO((unsigned int x, unsigned int y));
 TERM_PUBLIC void LINUX_vector __PROTO((unsigned int x, unsigned int y));
 TERM_PUBLIC int LINUX_text_angle __PROTO((int ang));
@ -249,7 +249,7 @@ diff -upr ../gnuplot-5.0.0.orig/term/linux.trm ./term/linux.trm
 TERM_PUBLIC void LINUX_suspend __PROTO((void));
 TERM_PUBLIC void LINUX_resume __PROTO((void));
 
-@@ -408,7 +408,7 @@ LINUX_putc(
+@@ -408,7 +408,7 @@
 }
 
 TERM_PUBLIC void
--- a/gnuplot-5.0.0.tar.gz
+++ b/gnuplot-5.0.0.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:417d4bc5bc914a60409bb75cf18dd14f48b07f53c6ad3c4a4d3cd9a8d7370faf
-size 4955900
--- a/gnuplot-5.0.1-fix-latex-docs.diff
+++ b/gnuplot-5.0.1-fix-latex-docs.diff
@ -0,0 +1,24 @@
+diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/docs/Makefile.am gnuplot-5.0.1.new/docs/Makefile.am
+--- gnuplot-5.0.1.orig/docs/Makefile.am	2015-05-03 00:22:33.000000000 +0200
+++ gnuplot-5.0.1.new/docs/Makefile.am	2015-12-01 01:24:55.097654431 +0100
+@@ -172,7 +172,7 @@
+ 	rm -f figures
+ 
+ pdffigures.tex:	figures
+-	@if [ -z pdffigures.tex ] ; then \
+	@if [ ! -f pdffigures.tex ] ; then \
+ 	  echo "\usepackage{graphicx}" > pdffigures.tex ; \
+ 	  echo "\usepackage{picins}" >> pdffigures.tex ; \
+ 	fi
+diff -U 3 -H -d -r -N -- gnuplot-5.0.1.orig/docs/Makefile.in gnuplot-5.0.1.new/docs/Makefile.in
+--- gnuplot-5.0.1.orig/docs/Makefile.in	2015-06-07 17:20:29.000000000 +0200
+++ gnuplot-5.0.1.new/docs/Makefile.in	2015-12-01 01:24:32.578385309 +0100
+@@ -952,7 +952,7 @@
+ 	rm -f figures
+ 
+ pdffigures.tex:	figures
+-	@if [ -z pdffigures.tex ] ; then \
+	@if [ ! -f pdffigures.tex ] ; then \
+ 	  echo "\usepackage{graphicx}" > pdffigures.tex ; \
+ 	  echo "\usepackage{picins}" >> pdffigures.tex ; \
+ 	fi
--- a/gnuplot-5.0.1.tar.gz
+++ b/gnuplot-5.0.1.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7cbc557e71df581ea520123fb439dea5f073adcc9010a2885dc80d4ed28b3c47
+size 4963747
--- a/gnuplot.changes
+++ b/gnuplot.changes
@ -1,3 +1,62 @@
+-------------------------------------------------------------------
+Mon Nov 30 23:56:19 UTC 2015 - nico.kruber@gmail.com
+
+- Update to 5.0.1
+  * NEW "set mono" (full command "set monochrome {linetype lt
+    <line-properties>}")
+  * NEW "set fit nolog" suppresses output to log file
+  * NEW sixel terminal supports RGB and palette colors, but only 16 at
+    a time :-(
+  * NEW command "printerr" acts exactly like "print" but always outputs
+    via stderr
+  * CHANGE autoconfigure of Qt5 support now looks for --variable=host_bins
+  * CHANGE reevaluate fill color for each polygon in data for
+    "with filledcurves"
+  * CHANGE gstrptime(): always check validity of %y %Y %d %B %b input fields
+  * CHANGE track text properties for key title separately from key entries
+  * CHANGE "smooth kdensity" now handles logscale y and explicit x range
+  * CHANGE order of margins in the "set margin" command to left, right,
+    bottom, top
+  * CHANGE guarantee color of key sample for "lc variable" plots matches
+    1st point
+  * CHANGE "set term fig color" can use predefined linetype colors and
+    named colors
+  * CHANGE skip all preprocessing for input lines beginning with shell escape
+    char
+  * CHANGE build system to suppress dvi as an automake-generated target
+  * CHANGE in hidden3d mode, the 'nosurface' suppresses both surface grid
+    directions
+  * FIX replace palette color value NaN with background color
+  * FIX improved handling of boxplot data with multiple factors (categories)
+  * FIX save_textcolor was not handling "tc variable"
+  * FIX apply numeric locale when reading ascii matrix data
+  * FIX handling of ascii matrix data
+  * FIX reinitialize brush used to draw dotted lines in gd terminal
+  * FIX failure to clear bold/italic text attributes in cairo terminals
+  * FIX tabular output of time data when the axis format has not been set
+  * FIX breakage in plot style filledcurves {above|below} y1=<yval>
+  * FIX dashtypes after "set term {e}pslatex mono"
+  * FIX report and enforce maximum number of parallel axes without faulting
+  * FIX smooth mcsplines for a curve containing multiple y values at a single x
+  * FIX several bugs evident for log-scaled color axis
+  * FIX regression in color support for pbm/sixel/hpgl terminals (no RGB color)
+  * FIX accummulated round-off error in dotted lines drawn by libgd terminals
+  * FIX incorrect colorbox axis labels in polar plots
+  * FIX AquaTerm framework name is case-sensitive
+  * FIX strip enhanced text markup from plot titles embedded in svg output
+  * FIX error in retrieving matrix column headers as strings
+  * FIX error in calculating absolute deviation (stats command)
+  * FIX allocation error from "set fit covariancevariables"
+  * FIX tkcanvas terminal handling of blank (default) font family name
+  * FIX off-by-one-error in color of contours when hidden3d is active
+  * FIX adjust WIN32 encoding used by text output from "pause" command
+  * FIX qt terminal 3D rotation mode tendency to get stuck "on"
+  * FIX dash pattern rendering in contour lines
+  * FIX 'fit [][min:max] f(x)' was incorrectly ignoring min:max 
+- Rediff gnuplot-4.6.0.dif
+- Add gnuplot-5.0.1-fix-latex-docs.diff to fix a regression of 5.0.1 in
+  building the latex docs
+
 -------------------------------------------------------------------
 Tue Jul 28 06:50:41 UTC 2015 - werner@suse.de

--- a/gnuplot.spec
+++ b/gnuplot.spec
@ -80,12 +80,12 @@ BuildRequires:  wxWidgets-devel >= 3
 BuildRequires:  xorg-x11
 BuildRequires:  xorg-x11-devel
 Url:            http://www.gnuplot.info/
-Version:        5.0.0
+Version:        5.0.1
 Release:        0
 Summary:        Function Plotting Utility and more
 License:        SUSE-Gnuplot and GPL-2.0+
 Group:          Productivity/Graphics/Visualization/Graph
-# http://sourceforge.net/projects/gnuplot/files/gnuplot/4.6.4/gnuplot-4.6.4.tar.gz/download
+# http://sourceforge.net/projects/gnuplot/files/gnuplot/5.0.1/gnuplot-5.0.1.tar.gz/download
 Source0:        gnuplot-%{version}.tar.gz
 Source2:        gnuplot-fr.doc.bz2
 Source3:        README.whynot
@ -105,6 +105,8 @@ 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
+# PATCH-FIX-UPSTREAM -- fix building latex docs
+Patch8:         gnuplot-5.0.1-fix-latex-docs.diff
 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"
@ -151,11 +153,12 @@ test $? -eq 0 || exit 1
 cp %{_sourcedir}/picins.sty docs
 %patch2 -p0 -b .font
 %patch4 -p0 -b .demo
-%patch0 -p0 -b .0
+%patch0 -p1 -b .0
 %patch1 -p0 -b .x11ovf
 %patch5 -p1 -b .w3x
 %patch6 -p0 -b .pic
 %patch7 -p0 -b .l531
+%patch8 -p1 -b .latex

 %build
 autoreconf -fi