!8 update to 5.4.5
From: @lyn1001 Reviewed-by: @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
commit
b6cb76addc
@ -1,17 +0,0 @@
|
||||
diff -up gnuplot-4.2.2/src/variable.c.refto gnuplot-4.2.2/src/variable.c
|
||||
--- gnuplot-4.2.2/src/variable.c.refto 2006-06-27 04:36:30.000000000 +0200
|
||||
+++ gnuplot-4.2.2/src/variable.c 2007-10-25 14:04:20.000000000 +0200
|
||||
@@ -263,8 +263,11 @@ static const struct path_table fontpath_
|
||||
{ "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
|
||||
#endif
|
||||
/* Linux paths */
|
||||
- { "/usr/X11R6/lib/X11/fonts/Type1" },
|
||||
- { "/usr/X11R6/lib/X11/fonts/truetype" },
|
||||
+ { "/usr/share/fonts/default/ghostscript/" },
|
||||
+ { "/usr/share/fonts/default/Type1/" },
|
||||
+ { "/usr/share/fonts/bitstream-vera/" },
|
||||
+ { "/usr/share/fonts/dejavu-lgc" },
|
||||
+ { "/usr/share/fonts/liberation" },
|
||||
/* HP-UX */
|
||||
{ "/usr/lib/X11/fonts!"},
|
||||
/* Ghostscript */
|
||||
13
gnuplot-5.0.0-lua_checkint.patch
Normal file
13
gnuplot-5.0.0-lua_checkint.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff -up wrk/term/lua.trm.wrk wrk/term/lua.trm
|
||||
--- wrk/term/lua.trm.wrk 2015-01-26 18:36:53.242174908 +0100
|
||||
+++ wrk/term/lua.trm 2015-01-26 18:38:44.674258427 +0100
|
||||
@@ -114,6 +114,9 @@ TERM_PUBLIC void LUA_boxed_text __PROTO(
|
||||
#include <lualib.h>
|
||||
#include <lauxlib.h>
|
||||
|
||||
+//luaL_checkint macro disappeared
|
||||
+#define luaL_checkint(L,n) ((int)luaL_checkinteger(L, (n)))
|
||||
+
|
||||
static lua_State *L = NULL;
|
||||
|
||||
static char *LUA_script = NULL;
|
||||
@ -1,77 +0,0 @@
|
||||
From: caomeng <caomeng5@huawei.com>
|
||||
Date: Fri, 15 Nov 2019 16:19:37 +0400
|
||||
Subject: [PATCH] add lib gobject when config
|
||||
Sometimes, if requires a initialization call to lib gobject, it should
|
||||
make that call itself rather than expecting the application to to the
|
||||
initialization.
|
||||
|
||||
Signed-off-by: caomeng <caomeng5@huawei.com>
|
||||
---
|
||||
configure | 20 +-
|
||||
1 file changed, 10 insertion(+), 10 deletion(-)
|
||||
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
--- a/configure 2019-11-15 09:49:05.702501694 +0800
|
||||
+++ a/configure 2019-11-15 09:47:57.641501400 +0800
|
||||
@@ -13980,12 +13980,12 @@
|
||||
pkg_cv_CAIROPDF_CFLAGS="$CAIROPDF_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0\""; } >&5
|
||||
- ($PKG_CONFIG --exists --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0") 2>&5
|
||||
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0\""; } >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
- pkg_cv_CAIROPDF_CFLAGS=`$PKG_CONFIG --cflags " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0" 2>/dev/null`
|
||||
+ pkg_cv_CAIROPDF_CFLAGS=`$PKG_CONFIG --cflags " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -13998,12 +13998,12 @@
|
||||
pkg_cv_CAIROPDF_LIBS="$CAIROPDF_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0\""; } >&5
|
||||
- ($PKG_CONFIG --exists --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0") 2>&5
|
||||
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0\""; } >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
- pkg_cv_CAIROPDF_LIBS=`$PKG_CONFIG --libs " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0" 2>/dev/null`
|
||||
+ pkg_cv_CAIROPDF_LIBS=`$PKG_CONFIG --libs " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@@ -14022,15 +14022,15 @@
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
- CAIROPDF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0"`
|
||||
+ CAIROPDF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0"`
|
||||
else
|
||||
- CAIROPDF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0"`
|
||||
+ CAIROPDF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$CAIROPDF_PKG_ERRORS" >&5
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
|
||||
-Package requirements ( cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0) were not met:
|
||||
+Package requirements ( cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0) were not met:
|
||||
|
||||
$CAIROPDF_PKG_ERRORS
|
||||
|
||||
@@ -14042,7 +14042,7 @@
|
||||
See the pkg-config man page for more details.
|
||||
" >&5
|
||||
$as_echo "$as_me: WARNING:
|
||||
-Package requirements ( cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0) were not met:
|
||||
+Package requirements ( cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0) were not met:
|
||||
|
||||
$CAIROPDF_PKG_ERRORS
|
||||
|
||||
Binary file not shown.
27
gnuplot-5.2.2-doc.patch
Normal file
27
gnuplot-5.2.2-doc.patch
Normal file
@ -0,0 +1,27 @@
|
||||
diff -up gnuplot-5.2.4/docs/gnuplot.doc gnuplot-5.2.4/docs/gnuplot
|
||||
diff -up gnuplot-5.2.4/docs/gnuplot-ja.doc gnuplot-5.2.4/docs/gnuplot-ja
|
||||
diff -up gnuplot-5.2.4/docs/Makefile.am.doc gnuplot-5.2.4/docs/Makefile.am
|
||||
--- gnuplot-5.2.4/docs/Makefile.am.doc 2017-12-22 18:32:48.000000000 +0100
|
||||
+++ gnuplot-5.2.4/docs/Makefile.am 2018-08-08 14:00:40.014932164 +0200
|
||||
@@ -322,7 +322,7 @@ ${ELCS}: gnuplot-eldoc.el
|
||||
# that only appears to work with a non-generated texi file for input.
|
||||
|
||||
gnuplot.info: gnuplot.texi
|
||||
- $(AM_V_GEN) $(MAKEINFO) -I$(srcdir) $< --no-split --output=$@
|
||||
+ $(AM_V_GEN) $(MAKEINFO) -I$(srcdir) $< --no-split --force --output=$@
|
||||
|
||||
install-info: gnuplot.info
|
||||
$(AM_V_at) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
|
||||
diff -up gnuplot-5.2.4/docs/Makefile.in.doc gnuplot-5.2.4/docs/Makefile.in
|
||||
--- gnuplot-5.2.4/docs/Makefile.in.doc 2018-06-01 03:51:14.000000000 +0200
|
||||
+++ gnuplot-5.2.4/docs/Makefile.in 2018-08-08 14:03:26.797479806 +0200
|
||||
@@ -1090,7 +1090,7 @@ ${ELCS}: gnuplot-eldoc.el
|
||||
# that only appears to work with a non-generated texi file for input.
|
||||
|
||||
gnuplot.info: gnuplot.texi
|
||||
- $(AM_V_GEN) $(MAKEINFO) -I$(srcdir) $< --no-split --output=$@
|
||||
+ $(AM_V_GEN) $(MAKEINFO) -I$(srcdir) $< --no-split --force --output=$@
|
||||
|
||||
install-info: gnuplot.info
|
||||
$(AM_V_at) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
|
||||
diff -up gnuplot-5.2.4/docs/psdoc/ps_file.doc gnuplot-5.2.4/docs/psdoc/ps_file
|
||||
21
gnuplot-5.2.8-cmd-opts.patch
Normal file
21
gnuplot-5.2.8-cmd-opts.patch
Normal file
@ -0,0 +1,21 @@
|
||||
diff -up gnuplot-5.2.8/man/gnuplot.1.cmd-opts gnuplot-5.2.8/man/gnuplot.1
|
||||
--- gnuplot-5.2.8/man/gnuplot.1.cmd-opts 2020-02-06 20:30:51.973985195 -0700
|
||||
+++ gnuplot-5.2.8/man/gnuplot.1 2020-02-06 20:32:02.527417607 -0700
|
||||
@@ -48,7 +48,7 @@ Support for a huge variety of output dev
|
||||
.PP
|
||||
\fB\-c scriptname ARG1 ARG2 ..., load script using gnuplot's "call" mechanism and pass it the remainder of the command line as arguments
|
||||
.PP
|
||||
-\fB\-d, \-\-default\fP settings. Do not read from gnuplotrc or ~/.gnuplot on entry.
|
||||
+\fB\-d, \-\-default\-settings\fP settings. Do not read from gnuplotrc or ~/.gnuplot on entry.
|
||||
.PP
|
||||
\fB\-e "command list"\fP executes the requested commands before loading the next input file.
|
||||
.PP
|
||||
@@ -56,7 +56,7 @@ Support for a huge variety of output dev
|
||||
.PP
|
||||
\fB\-h, \-\-help\fP print summary of usage
|
||||
.PP
|
||||
-\fB\-V\fP show current version
|
||||
+\fB\-V, \-\-version\fP show current version
|
||||
.SH X11 OPTIONS
|
||||
For terminal type x11, \fIgnuplot\fP
|
||||
accepts the standard X Toolkit options and resources such as geometry, font,
|
||||
@ -1,11 +1,12 @@
|
||||
diff -up gnuplot-5.0.6/demo/circles.dem.nolena gnuplot-5.0.6/demo/circles.dem
|
||||
--- gnuplot-5.0.6/demo/circles.dem.nolena 2017-06-26 12:44:54.497798902 -0400
|
||||
+++ gnuplot-5.0.6/demo/circles.dem 2017-06-26 12:45:05.006547459 -0400
|
||||
@@ -98,21 +98,6 @@ pause -1 "Hit return to continue"
|
||||
diff -up gnuplot-5.4.3/demo/circles.dem.nolena gnuplot-5.4.3/demo/circles.dem
|
||||
--- gnuplot-5.4.3/demo/circles.dem.nolena 2020-10-13 15:14:48.000000000 -0600
|
||||
+++ gnuplot-5.4.3/demo/circles.dem 2022-01-07 20:46:33.978684483 -0700
|
||||
@@ -66,22 +66,6 @@ pause -1 "Hit return to continue"
|
||||
|
||||
reset
|
||||
set size ratio -1
|
||||
-set title "Lena's key points"
|
||||
-unset xlabel
|
||||
-unset xtics
|
||||
-unset ytics
|
||||
-unset key
|
||||
@ -23,10 +24,10 @@ diff -up gnuplot-5.0.6/demo/circles.dem.nolena gnuplot-5.0.6/demo/circles.dem
|
||||
set title "Delaunay triangulation of Hemisphere points, some empty circles in red"
|
||||
unset key
|
||||
|
||||
diff -up gnuplot-5.0.6/demo/Makefile.am.nolena gnuplot-5.0.6/demo/Makefile.am
|
||||
--- gnuplot-5.0.6/demo/Makefile.am.nolena 2017-06-26 12:44:33.146309782 -0400
|
||||
+++ gnuplot-5.0.6/demo/Makefile.am 2017-06-26 12:44:43.322066306 -0400
|
||||
@@ -64,7 +64,7 @@ epslatex:
|
||||
diff -up gnuplot-5.4.3/demo/Makefile.am.nolena gnuplot-5.4.3/demo/Makefile.am
|
||||
--- gnuplot-5.4.3/demo/Makefile.am.nolena 2022-01-02 19:19:33.000000000 -0700
|
||||
+++ gnuplot-5.4.3/demo/Makefile.am 2022-01-07 20:47:13.536024223 -0700
|
||||
@@ -68,7 +68,7 @@ epslatex:
|
||||
dvips epslatex
|
||||
|
||||
##m4-files-begin
|
||||
@ -34,20 +35,20 @@ diff -up gnuplot-5.0.6/demo/Makefile.am.nolena gnuplot-5.0.6/demo/Makefile.am
|
||||
+EXTRA_DIST = Makefile.am.in scatter2.bin sine.bin \
|
||||
using.bin gnuplot.cfg world.cor 1.dat 2.dat 3.dat arrowstyle.dat \
|
||||
asciimat.dat battery.dat big_peak.dat candlesticks.dat cities.dat \
|
||||
clip14in.dat ctg-y2.dat delaunay-edges.dat ellipses.dat empty-circles.dat \
|
||||
@@ -97,7 +97,7 @@ stringvar.dem surface1.dem surface2.dem
|
||||
tics.dem timedat.dem transparent.dem transparent_solids.dem using.dem \
|
||||
utf8.dem varcolor.dem vector.dem world2.dem world.dem demo.edf density.fnc \
|
||||
hexa.fnc line.fnc reflect.fnc gen-random.inc stat.inc GM1_sugar.pdb \
|
||||
-bldg.png GM1_bonds.r3d blutux.rgb lena.rgb sound.par sound2.par start.par \
|
||||
+bldg.png GM1_bonds.r3d blutux.rgb sound.par sound2.par start.par \
|
||||
gnuplot.rot gnu-valley random-points gpdemos.tcl html
|
||||
clip14in.dat ctg-y2.dat delaunay-edges.dat dodecahedron.dat ellipses.dat \
|
||||
@@ -116,7 +116,7 @@ utf8.dem varcolor.dem vector.dem violinp
|
||||
vplot.dem walls.dem week_date.dem world2.dem world.dem zerror.dem \
|
||||
demo.edf density.fnc hexa.fnc line.fnc reflect.fnc gen-random.inc stat.inc \
|
||||
GM1_sugar.pdb aries.png bldg.png gradient.png icon64x64.png GM1_bonds.r3d \
|
||||
-blutux.rgb lena.rgb sound.par sound2.par start.par gnuplot.rot gnu-valley \
|
||||
+blutux.rgb sound.par sound2.par start.par gnuplot.rot gnu-valley \
|
||||
random-points gpdemos.tcl html
|
||||
##m4-files-end
|
||||
|
||||
diff -up gnuplot-5.0.6/demo/Makefile.in.nolena gnuplot-5.0.6/demo/Makefile.in
|
||||
--- gnuplot-5.0.6/demo/Makefile.in.nolena 2017-06-26 12:43:56.569184965 -0400
|
||||
+++ gnuplot-5.0.6/demo/Makefile.in 2017-06-26 12:44:17.562682652 -0400
|
||||
@@ -331,7 +331,7 @@ SUBDIRS = $(PLUGIN_DIR)
|
||||
diff -up gnuplot-5.4.3/demo/Makefile.in.nolena gnuplot-5.4.3/demo/Makefile.in
|
||||
--- gnuplot-5.4.3/demo/Makefile.in.nolena 2022-01-02 19:19:34.000000000 -0700
|
||||
+++ gnuplot-5.4.3/demo/Makefile.in 2022-01-07 20:47:34.991208498 -0700
|
||||
@@ -340,7 +340,7 @@ SUBDIRS = $(PLUGIN_DIR)
|
||||
DIST_SUBDIRS = plugin
|
||||
DEMO = all.dem
|
||||
GNUPLOT = gnuplot
|
||||
@ -55,19 +56,19 @@ diff -up gnuplot-5.0.6/demo/Makefile.in.nolena gnuplot-5.0.6/demo/Makefile.in
|
||||
+EXTRA_DIST = Makefile.am.in scatter2.bin sine.bin \
|
||||
using.bin gnuplot.cfg world.cor 1.dat 2.dat 3.dat arrowstyle.dat \
|
||||
asciimat.dat battery.dat big_peak.dat candlesticks.dat cities.dat \
|
||||
clip14in.dat ctg-y2.dat delaunay-edges.dat ellipses.dat empty-circles.dat \
|
||||
@@ -364,7 +364,7 @@ stringvar.dem surface1.dem surface2.dem
|
||||
tics.dem timedat.dem transparent.dem transparent_solids.dem using.dem \
|
||||
utf8.dem varcolor.dem vector.dem world2.dem world.dem demo.edf density.fnc \
|
||||
hexa.fnc line.fnc reflect.fnc gen-random.inc stat.inc GM1_sugar.pdb \
|
||||
-bldg.png GM1_bonds.r3d blutux.rgb lena.rgb sound.par sound2.par start.par \
|
||||
+bldg.png GM1_bonds.r3d blutux.rgb sound.par sound2.par start.par \
|
||||
gnuplot.rot gnu-valley random-points gpdemos.tcl html
|
||||
clip14in.dat ctg-y2.dat delaunay-edges.dat dodecahedron.dat ellipses.dat \
|
||||
@@ -388,7 +388,7 @@ utf8.dem varcolor.dem vector.dem violinp
|
||||
vplot.dem walls.dem week_date.dem world2.dem world.dem zerror.dem \
|
||||
demo.edf density.fnc hexa.fnc line.fnc reflect.fnc gen-random.inc stat.inc \
|
||||
GM1_sugar.pdb aries.png bldg.png gradient.png icon64x64.png GM1_bonds.r3d \
|
||||
-blutux.rgb lena.rgb sound.par sound2.par start.par gnuplot.rot gnu-valley \
|
||||
+blutux.rgb sound.par sound2.par start.par gnuplot.rot gnu-valley \
|
||||
random-points gpdemos.tcl html
|
||||
|
||||
@BUILD_PLUGIN_TRUE@PLUGIN_DIR = plugin
|
||||
diff -up gnuplot-5.0.6/demo/rgbalpha.dem.nolena gnuplot-5.0.6/demo/rgbalpha.dem
|
||||
--- gnuplot-5.0.6/demo/rgbalpha.dem.nolena 2017-06-26 12:46:06.232082511 -0400
|
||||
+++ gnuplot-5.0.6/demo/rgbalpha.dem 2017-06-26 12:46:37.431336005 -0400
|
||||
diff -up gnuplot-5.4.3/demo/rgbalpha.dem.nolena gnuplot-5.4.3/demo/rgbalpha.dem
|
||||
--- gnuplot-5.4.3/demo/rgbalpha.dem.nolena 2017-12-22 10:32:30.000000000 -0700
|
||||
+++ gnuplot-5.4.3/demo/rgbalpha.dem 2022-01-07 20:46:33.979684492 -0700
|
||||
@@ -18,8 +18,8 @@ set yrange [ 0. : 128. ]
|
||||
# Alpha = linear gradient on x
|
||||
|
||||
BIN
gnuplot-5.4.5.tar.gz
Normal file
BIN
gnuplot-5.4.5.tar.gz
Normal file
Binary file not shown.
13
gnuplot-config.patch
Normal file
13
gnuplot-config.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/configure b/configure
|
||||
index f1046e4..e0c4f76 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2092,7 +2092,7 @@ else
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
-char $2 ();
|
||||
+__attribute__ ((used)) char $2 ();
|
||||
/* The GNU C library defines this for functions which it implements
|
||||
to always fail with ENOSYS. Some functions are actually named
|
||||
something starting with __ and the normal name is an alias. */
|
||||
80
gnuplot.spec
80
gnuplot.spec
@ -1,19 +1,21 @@
|
||||
%global major_minor 5.0
|
||||
%global major_minor 5.4
|
||||
Name: gnuplot
|
||||
Summary: a portable command-line driven graphing utility
|
||||
Version: %{major_minor}.6
|
||||
Release: 13
|
||||
Version: %{major_minor}.5
|
||||
Release: 1
|
||||
License: gnuplot and MIT
|
||||
URL: http://www.gnuplot.info/
|
||||
|
||||
Source0: %{name}-%{version}-clean.tar.gz
|
||||
Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
|
||||
Patch0: gnuplot-4.2.0-refers_to.patch
|
||||
Patch1: gnuplot-4.2.0-fonts.patch
|
||||
Patch2: gnuplot-4.6.1-plot-sigsegv.patch
|
||||
Patch3: gnuplot-4.6.4-singlethread.patch
|
||||
Patch4: gnuplot-5.0.6-no-lena.patch
|
||||
Patch5: gnuplot-5.0.6-add-lib-gobject-when-config.patch
|
||||
Patch3: gnuplot-4.6.1-plot-sigsegv.patch
|
||||
Patch4: gnuplot-4.6.4-singlethread.patch
|
||||
Patch5: gnuplot-5.0.0-lua_checkint.patch
|
||||
Patch6: gnuplot-5.4.3-no-lena.patch
|
||||
Patch7: gnuplot-5.2.2-doc.patch
|
||||
Patch8: gnuplot-5.2.8-cmd-opts.patch
|
||||
Patch9: gnuplot-config.patch
|
||||
|
||||
BuildRequires: cairo-devel latex2html emacs gd-devel giflib-devel libotf libpng-devel
|
||||
BuildRequires: librsvg2 texinfo libX11-devel libXt-devel lua-devel m17n-lib tex-tex4ht
|
||||
@ -24,16 +26,16 @@ BuildRequires: qt5-qtsvg-devel qt5-qtbase-devel /usr/bin/texi2dvi
|
||||
Requires: tex-preview dejavu-sans-fonts
|
||||
Requires: tex(latex) tex(cm-super-t1.enc) tex(ecrm1000.tfm) tex(utf8x.def)
|
||||
|
||||
Requires(post): %{_sbindir}/alternatives /sbin/install-info
|
||||
Requires(preun): %{_sbindir}/alternatives /sbin/install-info
|
||||
Requires(post): %{_sbindir}/alternatives
|
||||
Requires(preun): %{_sbindir}/alternatives
|
||||
|
||||
Obsoletes: gnuplot-qt < 5.0.0-4
|
||||
|
||||
Obsoletes: %{name}-common = %{version}-%{release}
|
||||
Obsoletes: %{name}-common < %{version}-%{release}
|
||||
Provides: %{name}-common = %{version}-%{release}
|
||||
Obsoletes: %{name}-minimal = %{version}-%{release}
|
||||
Obsoletes: %{name}-minimal = %{version}-%{release}
|
||||
Provides: %{name}-latex = %{version}-%{release}
|
||||
Obsoletes: %{name}-minimal < %{version}-%{release}
|
||||
Provides: %{name}-minimal = %{version}-%{release}
|
||||
Obsoletes: %{name}-latex < %{version}-%{release}
|
||||
Provides: %{name}-latex = %{version}-%{release}
|
||||
|
||||
Obsoletes: emacs-%{name} <= 5.0.0-3
|
||||
@ -52,17 +54,18 @@ like Octave. Gnuplot has been supported and under active development since 1986.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
rm -rf demo/lena*
|
||||
|
||||
sed -i -e 's:"/usr/lib/X11/app-defaults":"%{_datadir}/X11/app-defaults":' src/gplt_x11.c
|
||||
iconv -f windows-1252 -t utf-8 ChangeLog > ChangeLog.aux
|
||||
ln -sf ChangeLog.aux ChangeLog
|
||||
chmod 644 src/getcolor.h demo/html/webify*
|
||||
chmod 644 src/getcolor.h
|
||||
chmod 644 demo/html/webify.pl
|
||||
chmod 644 demo/html/webify_svg.pl
|
||||
chmod 644 demo/html/webify_canvas.pl
|
||||
|
||||
%build
|
||||
|
||||
rm -rf demo/plugin/*.so demo/plugin/*.o
|
||||
%global configure_opts \\\
|
||||
--with-readline=builtin \\\
|
||||
--without-linux-vga \\\
|
||||
--enable-history-file \\\
|
||||
--with-texdir=/usr/share/texlive/texmf-dist/tex/latex/gnuplot
|
||||
mkdir minimal
|
||||
@ -83,23 +86,24 @@ cp -a ../configure .
|
||||
%make_build
|
||||
popd
|
||||
|
||||
%configure %{configure_opts} \
|
||||
--with-tutorial
|
||||
%configure %{configure_opts}
|
||||
|
||||
ln -s ../minimal/src/%{name} src/
|
||||
make -C docs info
|
||||
export GNUPLOT_PS_DIR=../../term/PostScript
|
||||
make -C docs/psdoc ps_symbols.ps ps_fontfile_doc.pdf
|
||||
make -C tutorial
|
||||
rm -rf docs/htmldocs/images.idx
|
||||
|
||||
%install
|
||||
make -C qt install DESTDIR=%{buildroot} INSTALL='install -p'
|
||||
cp -a %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-qt
|
||||
mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-qt
|
||||
install -p -m 755 minimal/src/%{name} %{buildroot}%{_bindir}/%{name}-minimal
|
||||
make -C docs install-info DESTDIR=%{buildroot} INSTALL='install -p'
|
||||
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||
install -d %{buildroot}%{_datadir}/X11/app-defaults
|
||||
cp -a %{buildroot}%{_datadir}/%{name}/%{major_minor}/app-defaults/Gnuplot %{buildroot}%{_datadir}/X11/app-defaults/Gnuplot
|
||||
install -d %{buildroot}/%{_mandir}/ja/man1
|
||||
cp -a %{buildroot}%{_mandir}/man1/%{name}-ja.1 %{buildroot}/%{_mandir}/ja/man1/
|
||||
mv %{buildroot}%{_datadir}/%{name}/%{major_minor}/app-defaults/Gnuplot %{buildroot}%{_datadir}/X11/app-defaults/Gnuplot
|
||||
rm -rf $RPM_BUILD_ROOT%{_libdir}/
|
||||
ln -s gnuplot.1 $RPM_BUILD_ROOT/%{_mandir}/man1/gnuplot-qt.1
|
||||
touch %{buildroot}%{_bindir}/%{name}
|
||||
|
||||
%posttrans
|
||||
@ -107,18 +111,12 @@ touch %{buildroot}%{_bindir}/%{name}
|
||||
%{_sbindir}/alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-minimal 40
|
||||
|
||||
%post
|
||||
if [ -f %{_infodir}/%{name}.info* ]; then
|
||||
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
|
||||
fi
|
||||
[ -e %{_bindir}/texhash ] && %{_bindir}/texhash 2> /dev/null;
|
||||
|
||||
%preun
|
||||
if [ $1 = 0 ]; then
|
||||
%{_sbindir}/alternatives --remove %{name} %{_bindir}/%{name}-qt || :
|
||||
%{_sbindir}/alternatives --remove %{name} %{_bindir}/%{name}-minimal || :
|
||||
if [ -f %{_infodir}/%{name}.info* ]; then
|
||||
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
|
||||
fi
|
||||
fi
|
||||
|
||||
%files
|
||||
@ -142,25 +140,23 @@ fi
|
||||
%dir %{_libexecdir}/%{name}/%{major_minor}
|
||||
%{_libexecdir}/%{name}/%{major_minor}/%{name}_x11
|
||||
%{_datadir}/X11/app-defaults/Gnuplot
|
||||
%{_infodir}/%{name}.info.gz
|
||||
%{_infodir}/%{name}.info*
|
||||
%{_bindir}/%{name}-minimal
|
||||
%{_datadir}/texlive/texmf-dist/tex/latex/%{name}/
|
||||
%exclude %{_infodir}/dir
|
||||
%exclude %{_datadir}/%{name}/%{major_minor}/app-defaults/Gnuplot
|
||||
|
||||
%files help
|
||||
%doc BUGS Copyright ChangeLog README NEWS
|
||||
%{_mandir}/man1/%{name}.1.gz
|
||||
%{_mandir}/ja/man1/%{name}-ja.1.gz
|
||||
%doc BUGS Copyright FAQ.pdf NEWS README RELEASE_NOTES
|
||||
%{_mandir}/man1/gnuplot.1*
|
||||
%{_mandir}/man1/gnuplot-qt.1*
|
||||
%doc docs/psdoc/ps_guide.ps
|
||||
%doc docs/psdoc/ps_symbols.ps
|
||||
%doc tutorial/tutorial.dvi
|
||||
%doc docs/psdoc/ps_file.doc demo
|
||||
%doc docs/psdoc/ps_fontfile_doc.pdf
|
||||
%doc tutorial/eg7.eps
|
||||
%exclude %{_mandir}/man1/%{name}-ja.1*
|
||||
|
||||
%changelog
|
||||
* Fri Apr 14 2023 liyanan <thistleslyn@163.com> - 5.4.5-1
|
||||
- Update to 5.4.5
|
||||
|
||||
* Thu Feb 09 2023 Ge Wang <wangge20@h-partners.com> - 5.0.6-13
|
||||
- Fix Missing texdir build failure due to texlive-base updated
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user