diff --git a/.gitignore b/.gitignore index 7ba635f..981b647 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gnuplot-4.4.0.tar.gz +/gnuplot-4.4.1.tar.gz diff --git a/gnuplot-4.4.1-mp.patch b/gnuplot-4.4.1-mp.patch new file mode 100644 index 0000000..ddacb79 --- /dev/null +++ b/gnuplot-4.4.1-mp.patch @@ -0,0 +1,15 @@ +diff -up gnuplot-4.4.1/man/gnuplot.1.pom gnuplot-4.4.1/man/gnuplot.1 +--- gnuplot-4.4.1/man/gnuplot.1.pom 2009-02-18 05:03:52.000000000 +0100 ++++ gnuplot-4.4.1/man/gnuplot.1 2010-09-24 14:58:00.000000000 +0200 +@@ -236,8 +236,8 @@ gnuplot. None of these are required. + .TP + .B GNUTERM + The name of the terminal type to be used. This overrides any terminal +-type sensed by gnuplot on start-up, but is itself overridden by the +-.gnuplot (or equivalent) start-up file (see \fBFILES\fP and "help ++type sensed by gnuplot on start-up, but is itself overridden by the .gnuplot ++(or equivalent) start-up file (see \fBFILES\fP and "help + start-up") and, of course, by later explicit changes. + .TP + .B GNUHELP +diff -up gnuplot-4.4.1/man/.pom gnuplot-4.4.1/man/ diff --git a/gnuplot.spec b/gnuplot.spec index ad37e8c..93b3232 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -1,13 +1,13 @@ %define major 4 %define minor 4 -%define patchlevel 0 +%define patchlevel 1 %define x11_app_defaults_dir %{_datadir}/X11/app-defaults Summary: A program for plotting mathematical expressions and data Name: gnuplot Version: %{major}.%{minor}.%{patchlevel} -Release: 5%{?dist} +Release: 1%{?dist} # Modifications are to be distributed as patches to the released version. # aglfn.txt has license: MIT License: gnuplot and MIT @@ -17,6 +17,7 @@ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source2: gnuplot-init.el Patch1: gnuplot-4.2.0-refers_to.patch Patch2: gnuplot-4.2.0-fonts.patch +Patch3: gnuplot-4.4.1-mp.patch BuildRequires: libpng-devel, tex(latex), zlib-devel, libX11-devel, emacs BuildRequires: texinfo, readline-devel, libXt-devel, gd-devel, wxGTK-devel BuildRequires: latex2html @@ -117,6 +118,7 @@ plotting tool. %setup -q %patch1 -p1 -b .refto %patch2 -p1 -b .font +%patch3 -p1 -b .mp sed -i -e 's:"/usr/lib/X11/app-defaults":"%{x11_app_defaults_dir}":' src/gplt_x11.c iconv -f windows-1252 -t utf-8 ChangeLog > ChangeLog.aux mv ChangeLog.aux ChangeLog @@ -255,7 +257,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/texmf/tex/latex/gnuplot/gnuplot-lua-tikz.sty %changelog -* Tue Aug 17 2010 Ivana Hutarova Varekova 4.4.0-4 +* Tue Aug 17 2010 Ivana Hutarova Varekova 4.4.1-1 +- Resolves: #633283 + update to 4.4.1 + fix man-page bug + +* Tue Aug 17 2010 Ivana Hutarova Varekova 4.4.0-5 - Resolves: #537960 Could not find/open font when opening font "arial" diff --git a/sources b/sources index c5b40da..77c48dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e708665bd512153ad5c35252fe499059 gnuplot-4.4.0.tar.gz +296e2904363e508bd8cb7e8ea1d267e8 gnuplot-4.4.1.tar.gz