From 4056a519bc6be083c4abb05246b2d6fb3b3ae80bfa281cee841c0bb717d6b4fa Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 14 Sep 2010 15:16:45 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=14 --- gnuplot-4.4.0-demo.dif | 8 ++--- gnuplot-4.4.0.tar.bz2 | 3 -- gnuplot-4.4.0.dif => gnuplot-4.4.1.dif | 19 +++++------ gnuplot-4.4.1.tar.bz2 | 3 ++ gnuplot.changes | 46 +++++++++++++++++++++++--- gnuplot.spec | 10 +++--- 6 files changed, 62 insertions(+), 27 deletions(-) delete mode 100644 gnuplot-4.4.0.tar.bz2 rename gnuplot-4.4.0.dif => gnuplot-4.4.1.dif (95%) create mode 100644 gnuplot-4.4.1.tar.bz2 diff --git a/gnuplot-4.4.0-demo.dif b/gnuplot-4.4.0-demo.dif index 69c3fc1..0b67270 100644 --- a/gnuplot-4.4.0-demo.dif +++ b/gnuplot-4.4.0-demo.dif @@ -224,8 +224,8 @@ reset --- src/show.c -+++ src/show.c 2010-05-10 14:04:43.814925577 +0200 -@@ -1054,6 +1054,15 @@ show_version(FILE *fp) ++++ src/show.c 2010-05-19 21:19:16.000000000 +0200 +@@ -1054,6 +1054,15 @@ p /* hit 'h' */ ); @@ -233,8 +233,8 @@ + { + struct stat st; + if ((stat(GNUPLOT_LIB_DEFAULT, &st) == 0) && S_ISDIR(st.st_mode)) { -+ fprintf(fp, "\n%s\tType `load \"all.dem\"` to display a large number of examples.", p); -+ fprintf(fp, "\n%s\tThey are located at %s/*\n\n", p, GNUPLOT_LIB_DEFAULT); ++ fprintf(fp, "%s\n%s\tType `load \"all.dem\"` to display a large number of examples.", p, p); ++ fprintf(fp, "\n%s\tThey are located at %s/*\n%s\n", p, GNUPLOT_LIB_DEFAULT, p); + } + } +#endif diff --git a/gnuplot-4.4.0.tar.bz2 b/gnuplot-4.4.0.tar.bz2 deleted file mode 100644 index ea5b078..0000000 --- a/gnuplot-4.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b2e3e9b84cfe0d24f6de72b460dcb0117cf1e2d89014726be672a9ec3145ad8 -size 2736120 diff --git a/gnuplot-4.4.0.dif b/gnuplot-4.4.1.dif similarity index 95% rename from gnuplot-4.4.0.dif rename to gnuplot-4.4.1.dif index 08c6cb5..a9f938f 100644 --- a/gnuplot-4.4.0.dif +++ b/gnuplot-4.4.1.dif @@ -104,8 +104,8 @@ else if (*buffer == 'A') sscanf(buffer + 1, "%lf", &plot->angle); --- src/plot.c -+++ src/plot.c 2009-05-09 11:32:24.000000000 +0000 -@@ -222,6 +222,7 @@ static int asked_privi = 0; ++++ src/plot.c 2010-09-14 17:08:15.836458107 +0200 +@@ -220,6 +220,7 @@ static int asked_privi = 0; void drop_privilege() { @@ -113,7 +113,7 @@ if (!asked_privi) { euid = geteuid(); egid = getegid(); -@@ -235,11 +236,13 @@ drop_privilege() +@@ -233,11 +234,13 @@ drop_privilege() if (seteuid(ruid) == -1) (void) fprintf(stderr, "seteuid(%d): %s\n", (int) ruid, strerror(errno)); @@ -127,7 +127,7 @@ if (!asked_privi) { euid = geteuid(); egid = getegid(); -@@ -253,6 +256,7 @@ take_privilege() +@@ -251,6 +254,7 @@ take_privilege() if (seteuid(euid) == -1) (void) fprintf(stderr, "seteuid(%d): %s\n", (int) euid, strerror(errno)); @@ -135,7 +135,7 @@ } #endif /* LINUXVGA */ -@@ -278,8 +282,8 @@ main(int argc, char **argv) +@@ -276,8 +280,8 @@ main(int argc, char **argv) int i; #ifdef LINUXVGA @@ -145,23 +145,22 @@ #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 */ -@@ -345,6 +349,23 @@ main(int argc, char **argv) - #if defined(HAVE_LIBEDITLINE) +@@ -344,6 +348,22 @@ main(int argc, char **argv) rl_getc_function = getc_wrapper; #endif -+ + +#ifdef __linux__ + if (!getenv("GNUHELP")) { + const char* msg = setlocale(LC_MESSAGES, NULL); + if (msg) { + char hfile[64]; + struct stat buf; -+ ++ + strcpy (hfile, "/usr/share/gnuplot/4.0/gnuplot-"); + strncat(hfile, msg, 2); + strcat (hfile, ".gih"); + if (stat(hfile, &buf) == 0) -+ setenv("GNUHELP", strdup(hfile), 0); ++ setenv("GNUHELP", strdup(hfile), 0); + } + } +#endif diff --git a/gnuplot-4.4.1.tar.bz2 b/gnuplot-4.4.1.tar.bz2 new file mode 100644 index 0000000..735a0ac --- /dev/null +++ b/gnuplot-4.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89894efd3a3ae49ad3b3fc5cb12e1fb387620de810dabe02ad896ca84ab0a187 +size 2739578 diff --git a/gnuplot.changes b/gnuplot.changes index f7a0db1..ff5a9fd 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Tue Sep 14 17:00:07 CEST 2010 - werner@suse.de + +- Update to gnuplot 4.4.0 + * NEW Support the "%s" format specifier in strftime() + * NEW Optional 6th data column in candlesticks style to specific box width + * NEW If integer arithmetic i*j or i**j would overflow, return value as a real + * NEW "set style circle radius " + * FIX autoconfiguration of readline support in OSX + * FIX font problems in win terminal + * FIX Protect against runaway recursion by limiting depth of nested functions + * FIX metapost terminal: Fix inheritance of line thickness by text strings + * FIX cairo terminals could segfault on certain enhanced text strings + * FIX pdfcairo output to stdout now works + * FIX font ",size" in non-enhanced mode postscript terminals + * FIX Do a better job of estimating the width of UTF-8 encoded strings + * FIX baseline bug in canvas terminal rotation of enhanced text + * FIX Allow "with labels" to work for binary input data + * FIX update user GPVAL variables after plot in table mode + * CHANGE depth-sorting of pm3d surfaces now applies jointly to all in the plot + * CHANGE 3D impulses are now always drawn from z=0 + * CHANGE Enable HIDDEN_QUADTREE by default + * CHANGE Enable "set fit errorvariables" by default + * CHANGE Regardless of current timefmt, read time from binary files as a binary + * CHANGE do not limit 3D rotation to 0 xap1 ----------------------------------------------------------------------------- +------------------------------------------------------------------- Wed Nov 13 23:06:41 MET 1996 - werner@suse.de - Neu Erstellen des Paketes: diff --git a/gnuplot.spec b/gnuplot.spec index 6af3cb2..215578a 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -1,5 +1,5 @@ # -# spec file for package gnuplot (Version 4.4.0) +# spec file for package gnuplot (Version 4.4.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -34,13 +34,13 @@ Url: http://www.gnuplot.info/ License: BSD3c(or similar) Group: Productivity/Graphics/Visualization/Graph AutoReqProv: on -Version: 4.4.0 -Release: 2 +Version: 4.4.1 +Release: 1 Summary: GNUplot a Function Plotting Utility Source0: gnuplot-%{version}.tar.bz2 Source2: gnuplot-fr.doc.bz2 Source3: README.whynot -Patch0: gnuplot-4.4.0.dif +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 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _x11lib %{_exec_prefix}/%{_lib} %define _x11data %{_exec_prefix}/lib/X11 %define _libx11 %{_x11data} -%define _x11inc %{_x11_prefix}/include +%define _x11inc %{_exec_prefix}/include %define _appdef %{_x11data}/app-defaults %else %define _x11lib %{_libdir}