Update to 5.4.8
This commit is contained in:
Orion Poplawski
parent
d6293d9c93
commit
44f152eedc
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@
|
||||
/gnuplot-5.4.2-clean.tar.gz
|
||||
/gnuplot-5.4.3-clean.tar.gz
|
||||
/gnuplot-5.4.5-clean.tar.xz
|
||||
/gnuplot-5.4.8-clean.tar.xz
|
||||
|
||||
@ -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 */
|
||||
@ -1,12 +1,12 @@
|
||||
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
|
||||
diff -up gnuplot-5.4.8/man/gnuplot.1.cmd-opts gnuplot-5.4.8/man/gnuplot.1
|
||||
--- gnuplot-5.4.8/man/gnuplot.1.cmd-opts 2023-04-20 21:50:18.000000000 -0600
|
||||
+++ gnuplot-5.4.8/man/gnuplot.1 2023-06-07 18:56:00.158338378 -0600
|
||||
@@ -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.
|
||||
-\fB\-d, \-\-default\fP settings. Do not read from gnuplotrc, ~/.gnuplot, and $XDG_CONFIG_HOME/gnuplot/gnuplotrc on entry.
|
||||
+\fB\-d, \-\-default-settings\fP do not read from gnuplotrc, ~/.gnuplot, and $XDG_CONFIG_HOME/gnuplot/gnuplotrc on entry.
|
||||
.PP
|
||||
\fB\-e "command list"\fP executes the requested commands before loading the next input file.
|
||||
.PP
|
||||
@ -1,5 +0,0 @@
|
||||
(autoload 'gnuplot-mode "gnuplot" "gnuplot major mode" t)
|
||||
(autoload 'gnuplot-make-buffer "gnuplot"
|
||||
"open a buffer in gnuplot-mode" t)
|
||||
(setq auto-mode-alist (append '(("\\.gp$" . gnuplot-mode))
|
||||
auto-mode-alist))
|
||||
78
gnuplot.spec
78
gnuplot.spec
@ -1,6 +1,6 @@
|
||||
%global major 5
|
||||
%global minor 4
|
||||
%global patchlevel 5
|
||||
%global patchlevel 8
|
||||
|
||||
%global x11_app_defaults_dir %{_datadir}/X11/app-defaults
|
||||
|
||||
@ -19,25 +19,25 @@
|
||||
Summary: A program for plotting mathematical expressions and data
|
||||
Name: gnuplot
|
||||
Version: %{major}.%{minor}.%{patchlevel}
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
# MIT .. term/PostScript/aglfn.txt
|
||||
License: gnuplot and MIT
|
||||
URL: http://www.gnuplot.info/
|
||||
# Need to remove non-free lena files
|
||||
# rm -rf demo/lena*
|
||||
# Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
#Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
Source0: %{name}-%{version}-clean.tar.xz
|
||||
Source1: gnuplot-init.el
|
||||
|
||||
Patch1: gnuplot-4.2.0-fonts.patch
|
||||
# resolves: #812225
|
||||
# submitted upstream: http://sourceforge.net/tracker/?func=detail&aid=3558973&group_id=2055&atid=302055
|
||||
# submitted upstream: https://sourceforge.net/p/gnuplot/gnuplot-main/merge-requests/26/
|
||||
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
|
||||
# submitted upstream: https://sourceforge.net/p/gnuplot/gnuplot-main/merge-requests/25/
|
||||
Patch8: gnuplot-cmd-opts.patch
|
||||
Patch9: gnuplot-config.patch
|
||||
|
||||
Requires: %{name}-common = %{version}-%{release}
|
||||
@ -46,7 +46,9 @@ Requires(post): /usr/sbin/alternatives
|
||||
Requires(preun): /usr/sbin/alternatives
|
||||
|
||||
#libedit-devel can not handle utf8, readline-devel is not legal with gnuplot, stick to builtin
|
||||
BuildRequires: cairo-devel, emacs, gd-devel, giflib-devel, libotf, libpng-devel
|
||||
BuildRequires: cairo-devel, gd-devel, giflib-devel, libotf, libpng-devel
|
||||
# To produce gnuplot.info
|
||||
BuildRequires: emacs
|
||||
BuildRequires: librsvg2, libX11-devel, libXt-devel, lua-devel, m17n-lib
|
||||
BuildRequires: pango-devel, tex(latex), tex(subfigure.sty)
|
||||
BuildRequires: tex(cm-super-t1.enc), tex-tex4ht, texinfo
|
||||
@ -124,29 +126,6 @@ dimensions and in many different formats.
|
||||
This package provides a wxGTK based terminal version of gnuplot.
|
||||
%endif
|
||||
|
||||
#%package -n emacs-%{name}
|
||||
#Group: Applications/Engineering
|
||||
#Summary: Emacs bindings for the gnuplot main application
|
||||
#Requires: %{name} = %{version}-%{release}
|
||||
#Requires: emacs >= %{_emacs_version}
|
||||
#BuildRequires: emacs-el pkgconfig
|
||||
#BuildArch: noarch
|
||||
#Provides: gnuplot-emacs = %{version}-%{release}
|
||||
|
||||
#%description -n emacs-%{name}
|
||||
#The gnuplot-emacs package contains the emacs related .elc files so that gnuplot
|
||||
#nicely interacts and integrates into emacs.
|
||||
|
||||
#%package -n emacs-%{name}-el
|
||||
#Group: Applications/Engineering
|
||||
#Summary: Emacs bindings for the gnuplot main application
|
||||
#Requires: emacs-%{name} = %{version}-%{release}
|
||||
#BuildArch: noarch
|
||||
|
||||
#%description -n emacs-%{name}-el
|
||||
#The gnuplot-emacs package contains the emacs related .el files so that gnuplot
|
||||
#nicely interacts and integrates into emacs.
|
||||
|
||||
%package doc
|
||||
Summary: Documentation fo bindings for the gnuplot main application
|
||||
BuildArch: noarch
|
||||
@ -167,14 +146,14 @@ plotting tool.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1 -b .font
|
||||
%patch3 -p1 -b .plot-sigsegv
|
||||
%patch4 -p1 -b .isinglethread
|
||||
%patch5 -p1 -b .checkint
|
||||
%patch6 -p1 -b .nolena
|
||||
%patch7 -p1 -b .doc
|
||||
%patch8 -p1 -b .cmd-opts
|
||||
%patch9 -p1 -b .config
|
||||
%patch -P1 -p1 -b .font
|
||||
%patch -P3 -p1 -b .plot-sigsegv
|
||||
%patch -P4 -p1 -b .isinglethread
|
||||
%patch -P5 -p1 -b .checkint
|
||||
%patch -P6 -p1 -b .nolena
|
||||
%patch -P7 -p1 -b .doc
|
||||
%patch -P8 -p1 -b .cmd-opts
|
||||
%patch -P9 -p1 -b .config
|
||||
sed -i -e 's:"/usr/lib/X11/app-defaults":"%{x11_app_defaults_dir}":' src/gplt_x11.c
|
||||
chmod 644 src/getcolor.h
|
||||
chmod 644 demo/html/webify.pl
|
||||
@ -243,14 +222,6 @@ install -p -m 755 minimal/src/gnuplot $RPM_BUILD_ROOT%{_bindir}/gnuplot-minimal
|
||||
# install info
|
||||
make -C docs install-info DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
|
||||
|
||||
# install emacs files
|
||||
#install -d ${RPM_BUILD_ROOT}/%{_emacs_sitestartdir}/
|
||||
#install -p -m 644 %SOURCE1 ${RPM_BUILD_ROOT}/%{_emacs_sitestartdir}/gnuplot-init.el
|
||||
#rm -f $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/info-look*.el*
|
||||
#install -d ${RPM_BUILD_ROOT}/%{_emacs_sitelispdir}/%{name}
|
||||
#mv $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot.el{,c} $RPM_BUILD_ROOT/%{_emacs_sitelispdir}/%{name}
|
||||
#mv $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot-gui.el{,c} $RPM_BUILD_ROOT/%{_emacs_sitelispdir}/%{name}
|
||||
|
||||
#packaged by info package, updated by post-installation script, do not package here
|
||||
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||
|
||||
@ -344,23 +315,14 @@ fi
|
||||
%{_bindir}/gnuplot-wx
|
||||
%endif
|
||||
|
||||
#%files -n emacs-%{name}
|
||||
#%doc Copyright
|
||||
#%dir %{_emacs_sitelispdir}/%{name}
|
||||
#%{_emacs_sitelispdir}/*.elc
|
||||
#%{_emacs_sitelispdir}/%{name}/*.elc
|
||||
#%{_emacs_sitestartdir}/*.el
|
||||
|
||||
#%files -n emacs-%{name}-el
|
||||
#%doc Copyright
|
||||
#%{_emacs_sitelispdir}/%{name}/*.el
|
||||
#%{_emacs_sitelispdir}/*.el
|
||||
|
||||
%files latex
|
||||
%doc Copyright
|
||||
%{_texmf_vendor}/tex/latex/gnuplot/
|
||||
|
||||
%changelog
|
||||
* Thu Jun 08 2023 Orion Poplawski <orion@nwra.com> - 5.4.8-1
|
||||
- Update to 5.4.8
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (gnuplot-5.4.5-clean.tar.xz) = 02aba7af92f1c4ab827087d7a62a7cf3bcd1ac424651bae841b28a69d891f8856ebdd7b43385bb03710dc493d187a34080956daf09056f0d6b7726b6ec207562
|
||||
SHA512 (gnuplot-5.4.8-clean.tar.xz) = 7ce7ec88d0f000d39400fb3a1810d7ee5e86fea24ddf5f50eb826582c9370bca069adec18983356283365adf157e2286ad8d2ce3731ba371f0b2cc969399a440
|
||||
|
||||
Loading…
Reference in New Issue
Block a user