diff --git a/gnuplot-4.4.0-wxt.dif b/gnuplot-4.4.0-wxt.dif deleted file mode 100644 index 53f8520..0000000 --- a/gnuplot-4.4.0-wxt.dif +++ /dev/null @@ -1,26 +0,0 @@ ---- src/term.c -+++ src/term.c 2011-04-21 10:38:51.000000000 +0200 -@@ -1718,11 +1718,6 @@ init_terminal() - term_name = "sun"; - #endif /* SUN */ - --#ifdef WXWIDGETS -- if (term_name == (char *) NULL) -- term_name = "wxt"; --#endif -- - #ifdef _Windows - /* let the wxWidgets terminal be the default when available */ - if (term_name == (char *) NULL) -@@ -1758,6 +1753,11 @@ init_terminal() - term_name = "x11"; - #endif /* x11 */ - -+#ifdef WXWIDGETS -+ if (term_name == (char *) NULL) -+ term_name = "wxt"; -+#endif -+ - #ifdef AMIGA - term_name = "amiga"; - #endif diff --git a/gnuplot-4.4.1.dif b/gnuplot-4.4.1.dif index a9f938f..7fca079 100644 --- a/gnuplot-4.4.1.dif +++ b/gnuplot-4.4.1.dif @@ -200,25 +200,6 @@ /* wire printers */ /* Epson LX-800, Star NL-10, NX-1000 and lots of others */ ---- src/time.c -+++ src/time.c 2009-05-09 11:32:24.000000000 +0000 -@@ -291,11 +291,12 @@ gstrptime(char *s, char *fmt, struct tm - case 's': - #if 0 /* HBB 20040213: comment this out, but keep it around for now */ - { -- /* time_t when; */ -- int when; -+ time_t when; -+ int iwhen; - struct tm *tmwhen; -- s = read_int(s, 10, &when); -- tmwhen = gmtime((time_t*)&when); -+ s = read_int(s, 10, &iwhen); -+ when = iwhen; -+ tmwhen = gmtime(&when); - tmwhen->tm_year += 1900; - *tm = *tmwhen; - break; --- term/linux.trm +++ term/linux.trm 2009-05-09 11:32:24.000000000 +0000 @@ -80,7 +80,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO( diff --git a/gnuplot-4.4.3.tar.bz2 b/gnuplot-4.4.3.tar.bz2 deleted file mode 100644 index 51333a7..0000000 --- a/gnuplot-4.4.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9ad674de420f70ee729eeeb2af5565f1e97b031aa68901ba9454c86834acd4b -size 2746157 diff --git a/gnuplot-4.4.4.tar.bz2 b/gnuplot-4.4.4.tar.bz2 new file mode 100644 index 0000000..c82ecbe --- /dev/null +++ b/gnuplot-4.4.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2fe678cb7f9587dd0cc3b5707484435c1342c209f6cd5b8a74ac405caed0e55 +size 2746669 diff --git a/gnuplot.changes b/gnuplot.changes index d265032..a6abe3d 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Tue Nov 29 22:48:07 UTC 2011 - burnus@net-b.de + +- Update to gnuplot 4.4.4 + * NEW boxxyerrors plot style now allows variable color + * NEW splot with pm3d now allows variable rgb color + * NEW "nonuniform matrix" indicates ascii data with explicit x, y + * CHANGE columnhead(N) is a string-valued function, not a keyword + * CHANGE Demarcate plots in svg output using ... + * CHANGE xticlabels() works for binary data files as well as ascii + * CHANGE "set key maxrows" now applies to 3D plots as well as 2D + * CHANGE rewrite installation path rules for TeX files + * FIX wxt terminal should now work on at least some flavors of OSX + * FIX incorrect space allowed for outside left key box + * FIX buffer overflow from enhanced text timefmt tic labels + * FIX correction for offset in epochs when reading in time format "%s" + * FIX discontinuity in defined palette limited by maxcolors + * FIX initialization of svg pattern-fill definitions + * FIX positioning of histogram bars when some data entries are missing + * FIX emf terminal can handle UTF-8 encoding + * FIX User-specified axis tick labels override auto labels in 3D + just as in 2D + * FIX `plot with labels` failed to skip labels with UNDEFINED coords + * FIX NaN (not a number) implementation for Windows build + * FIX work-around for poor scaling in pdfcairo pattern fill + * FIX segfault if mismatch between palette sizes of successive terminals + ------------------------------------------------------------------- Thu Apr 21 08:44:34 UTC 2011 - burnus@net-b.de diff --git a/gnuplot.spec b/gnuplot.spec index 7da3da7..a86a9e8 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -39,8 +39,8 @@ Url: http://www.gnuplot.info/ License: BSD3c(or similar) Group: Productivity/Graphics/Visualization/Graph AutoReqProv: on -Version: 4.4.3 -Release: 2 +Version: 4.4.4 +Release: 1 Summary: GNUplot a Function Plotting Utility Source0: gnuplot-%{version}.tar.bz2 Source2: gnuplot-fr.doc.bz2 @@ -48,7 +48,6 @@ Source3: README.whynot Patch0: gnuplot-4.4.1.dif Patch1: gnuplot-4.4.0-x11ovf.dif Patch2: gnuplot-4.4.0-fonts.dif -Patch3: gnuplot-4.4.0-wxt.dif Patch4: gnuplot-4.4.0-demo.dif Patch6: gnuplot-4.2.5-fix-format-errors.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,7 +102,6 @@ bunzip2 -dc %{_sourcedir}/gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc test $? -eq 0 || exit 1 %patch -P 1 -p 0 -b .x11ovf %patch -P 2 -p 0 -b .font -#%patch -P 3 -p 0 %patch -P 4 -p 0 %patch -P 6 -p 0 %patch -P 0 -p 0 @@ -120,10 +118,12 @@ test $? -eq 0 || exit 1 test -e $f || continue mv $f $f.bak done +%if 0%{?suse_version} >= 1110 touch configure.in rm -f config.status config.log config.cache configure aclocal.m4 aclocal -I m4 autoconf +%endif ./configure \ --prefix=%{_prefix} \ --mandir=%{_mandir} \