From ddbd3d2e783b8b68273b240bf4e645ce7cb9dd244f605da3948538b736e1faee Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 10 May 2010 12:28:23 +0000 Subject: [PATCH 1/3] . OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=9 --- README.whynot | 3 ++- gnuplot-4.4.0-demo.dif | 40 ++++++++++++++++++++++++++++++++-------- gnuplot-4.4.0.dif | 11 +++++++++++ gnuplot.changes | 5 +++++ gnuplot.spec | 3 ++- 5 files changed, 52 insertions(+), 10 deletions(-) diff --git a/README.whynot b/README.whynot index 5621012..5b707f9 100644 --- a/README.whynot +++ b/README.whynot @@ -2,4 +2,5 @@ =============================== Requires libpdf which is a commercial library and therefore not -part of SuSE LINUX. +part of SuSE LINUX. As a replacement the `pdfcairo' terminal +can be used to generate output in pdf. diff --git a/gnuplot-4.4.0-demo.dif b/gnuplot-4.4.0-demo.dif index c290de2..69c3fc1 100644 --- a/gnuplot-4.4.0-demo.dif +++ b/gnuplot-4.4.0-demo.dif @@ -223,33 +223,57 @@ pause -1 "Hit return to continue" reset +--- src/show.c ++++ src/show.c 2010-05-10 14:04:43.814925577 +0200 +@@ -1054,6 +1054,15 @@ show_version(FILE *fp) + p /* hit 'h' */ + ); + ++#ifdef GNUPLOT_LIB_DEFAULT ++ { ++ 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); ++ } ++ } ++#endif + + /* show version long */ + if (almost_equals(c_token, "l$ong")) { --- src/variable.c +++ src/variable.c 2009-06-15 12:01:39.000000000 +0000 -@@ -37,7 +37,7 @@ static char *RCSid() { return RCSid("$Id +@@ -37,7 +37,10 @@ static char *RCSid() { return RCSid("$Id /* The Death of Global Variables - part one. */ #include - +#include ++#include ++#include ++#include #include "variable.h" #include "alloc.h" -@@ -95,6 +95,14 @@ loadpath_handler(int action, char *path) +@@ -95,6 +98,17 @@ loadpath_handler(int action, char *path) if (!loadpath) { char *envlib = getenv("GNUPLOT_LIB"); +#ifdef GNUPLOT_LIB_DEFAULT + char *defenvlib = (char*)0; -+ if (envlib) { -+ if (asprintf(&defenvlib, "%s:%s", envlib, GNUPLOT_LIB_DEFAULT) > 0) -+ envlib = defenvlib; -+ } else -+ envlib = GNUPLOT_LIB_DEFAULT; ++ struct stat st; ++ if ((stat(GNUPLOT_LIB_DEFAULT, &st) == 0) && S_ISDIR(st.st_mode)) { ++ if (envlib) { ++ if (asprintf(&defenvlib, "%s:%s", envlib, GNUPLOT_LIB_DEFAULT) > 0) ++ envlib = defenvlib; ++ } else ++ envlib = GNUPLOT_LIB_DEFAULT; ++ } +#endif /* GNUPLOT_LIB_DEFAULT */ if (envlib) { int len = strlen(envlib); loadpath = gp_strdup(envlib); -@@ -103,6 +111,10 @@ loadpath_handler(int action, char *path) +@@ -103,6 +117,10 @@ loadpath_handler(int action, char *path) /* convert all PATHSEPs to \0 */ PATHSEP_TO_NUL(loadpath); } /* else: NULL = empty */ diff --git a/gnuplot-4.4.0.dif b/gnuplot-4.4.0.dif index e2a8492..08c6cb5 100644 --- a/gnuplot-4.4.0.dif +++ b/gnuplot-4.4.0.dif @@ -76,6 +76,17 @@ %c l . %Touche fléchée@Fonction %_ +--- src/gadgets.h ++++ src/gadgets.h 2010-05-10 10:57:45.850924766 +0000 +@@ -389,7 +389,7 @@ extern TBOOLEAN clip_lines1; + extern TBOOLEAN clip_lines2; + extern TBOOLEAN clip_points; + +-#define SAMPLES 100 /* default number of samples for a plot */ ++#define SAMPLES 500 /* default number of samples for a plot */ + extern int samples_1; + extern int samples_2; + --- src/gplt_x11.c +++ src/gplt_x11.c 2009-05-09 11:32:24.000000000 +0000 @@ -2256,8 +2256,11 @@ exec_cmd(plot_struct *plot, char *comman diff --git a/gnuplot.changes b/gnuplot.changes index 5857308..f7a0db1 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 9 00:00:00 CEST 2010 - dieter.jurzitza@t-online.de + +- Fix AppDefDir vs. XAPPLRESDIR inconsistency, increase default number of samples. + ------------------------------------------------------------------- Wed Apr 7 10:50:19 CEST 2010 - werner@suse.de diff --git a/gnuplot.spec b/gnuplot.spec index 5cd0ac1..258ae59 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -113,7 +113,7 @@ test $? -eq 0 || exit 1 aclocal -I m4 autoconf ./configure \ - --prefix=%{_prefix} \ + --prefix=%{_prefix} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --libexecdir=%{_libdir} \ @@ -122,6 +122,7 @@ test $? -eq 0 || exit 1 --with-x \ --x-includes=%{_x11inc} \ --x-libraries=%{_x11lib}\ + --with-x-app-defaultdir=%{_appdef}\ --with-readline=gnu \ --enable-history-file \ --with-linux-vga \ From ed3d389896fbc8f844f90035299136ff01ea256a5f38c88acebd7332ba29822e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 12 May 2010 16:26:54 +0000 Subject: [PATCH 2/3] Accepting request 39729 from Publishing checked in (request 39729) OBS-URL: https://build.opensuse.org/request/show/39729 OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=10 --- README.whynot | 3 +-- gnuplot-4.4.0-demo.dif | 40 ++++++++-------------------------------- gnuplot-4.4.0.dif | 11 ----------- gnuplot.changes | 5 ----- gnuplot.spec | 3 +-- 5 files changed, 10 insertions(+), 52 deletions(-) diff --git a/README.whynot b/README.whynot index 5b707f9..5621012 100644 --- a/README.whynot +++ b/README.whynot @@ -2,5 +2,4 @@ =============================== Requires libpdf which is a commercial library and therefore not -part of SuSE LINUX. As a replacement the `pdfcairo' terminal -can be used to generate output in pdf. +part of SuSE LINUX. diff --git a/gnuplot-4.4.0-demo.dif b/gnuplot-4.4.0-demo.dif index 69c3fc1..c290de2 100644 --- a/gnuplot-4.4.0-demo.dif +++ b/gnuplot-4.4.0-demo.dif @@ -223,57 +223,33 @@ pause -1 "Hit return to continue" reset ---- src/show.c -+++ src/show.c 2010-05-10 14:04:43.814925577 +0200 -@@ -1054,6 +1054,15 @@ show_version(FILE *fp) - p /* hit 'h' */ - ); - -+#ifdef GNUPLOT_LIB_DEFAULT -+ { -+ 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); -+ } -+ } -+#endif - - /* show version long */ - if (almost_equals(c_token, "l$ong")) { --- src/variable.c +++ src/variable.c 2009-06-15 12:01:39.000000000 +0000 -@@ -37,7 +37,10 @@ static char *RCSid() { return RCSid("$Id +@@ -37,7 +37,7 @@ static char *RCSid() { return RCSid("$Id /* The Death of Global Variables - part one. */ #include - +#include -+#include -+#include -+#include #include "variable.h" #include "alloc.h" -@@ -95,6 +98,17 @@ loadpath_handler(int action, char *path) +@@ -95,6 +95,14 @@ loadpath_handler(int action, char *path) if (!loadpath) { char *envlib = getenv("GNUPLOT_LIB"); +#ifdef GNUPLOT_LIB_DEFAULT + char *defenvlib = (char*)0; -+ struct stat st; -+ if ((stat(GNUPLOT_LIB_DEFAULT, &st) == 0) && S_ISDIR(st.st_mode)) { -+ if (envlib) { -+ if (asprintf(&defenvlib, "%s:%s", envlib, GNUPLOT_LIB_DEFAULT) > 0) -+ envlib = defenvlib; -+ } else -+ envlib = GNUPLOT_LIB_DEFAULT; -+ } ++ if (envlib) { ++ if (asprintf(&defenvlib, "%s:%s", envlib, GNUPLOT_LIB_DEFAULT) > 0) ++ envlib = defenvlib; ++ } else ++ envlib = GNUPLOT_LIB_DEFAULT; +#endif /* GNUPLOT_LIB_DEFAULT */ if (envlib) { int len = strlen(envlib); loadpath = gp_strdup(envlib); -@@ -103,6 +117,10 @@ loadpath_handler(int action, char *path) +@@ -103,6 +111,10 @@ loadpath_handler(int action, char *path) /* convert all PATHSEPs to \0 */ PATHSEP_TO_NUL(loadpath); } /* else: NULL = empty */ diff --git a/gnuplot-4.4.0.dif b/gnuplot-4.4.0.dif index 08c6cb5..e2a8492 100644 --- a/gnuplot-4.4.0.dif +++ b/gnuplot-4.4.0.dif @@ -76,17 +76,6 @@ %c l . %Touche fléchée@Fonction %_ ---- src/gadgets.h -+++ src/gadgets.h 2010-05-10 10:57:45.850924766 +0000 -@@ -389,7 +389,7 @@ extern TBOOLEAN clip_lines1; - extern TBOOLEAN clip_lines2; - extern TBOOLEAN clip_points; - --#define SAMPLES 100 /* default number of samples for a plot */ -+#define SAMPLES 500 /* default number of samples for a plot */ - extern int samples_1; - extern int samples_2; - --- src/gplt_x11.c +++ src/gplt_x11.c 2009-05-09 11:32:24.000000000 +0000 @@ -2256,8 +2256,11 @@ exec_cmd(plot_struct *plot, char *comman diff --git a/gnuplot.changes b/gnuplot.changes index f7a0db1..5857308 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Sun May 9 00:00:00 CEST 2010 - dieter.jurzitza@t-online.de - -- Fix AppDefDir vs. XAPPLRESDIR inconsistency, increase default number of samples. - ------------------------------------------------------------------- Wed Apr 7 10:50:19 CEST 2010 - werner@suse.de diff --git a/gnuplot.spec b/gnuplot.spec index 258ae59..5cd0ac1 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -113,7 +113,7 @@ test $? -eq 0 || exit 1 aclocal -I m4 autoconf ./configure \ - --prefix=%{_prefix} \ + --prefix=%{_prefix} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --libexecdir=%{_libdir} \ @@ -122,7 +122,6 @@ test $? -eq 0 || exit 1 --with-x \ --x-includes=%{_x11inc} \ --x-libraries=%{_x11lib}\ - --with-x-app-defaultdir=%{_appdef}\ --with-readline=gnu \ --enable-history-file \ --with-linux-vga \ From 98d6fc3c00902272317831a58aef725716a41413939080527dbadab59032ad3e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 12 May 2010 16:26:55 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/gnuplot revision 22.0 OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=a172cc558c942c02cdfef5fccc91af46 --- README.whynot | 3 ++- gnuplot-4.4.0-demo.dif | 40 ++++++++++++++++++++++++++++++++-------- gnuplot-4.4.0.dif | 11 +++++++++++ gnuplot.changes | 5 +++++ gnuplot.spec | 5 +++-- 5 files changed, 53 insertions(+), 11 deletions(-) diff --git a/README.whynot b/README.whynot index 5621012..5b707f9 100644 --- a/README.whynot +++ b/README.whynot @@ -2,4 +2,5 @@ =============================== Requires libpdf which is a commercial library and therefore not -part of SuSE LINUX. +part of SuSE LINUX. As a replacement the `pdfcairo' terminal +can be used to generate output in pdf. diff --git a/gnuplot-4.4.0-demo.dif b/gnuplot-4.4.0-demo.dif index c290de2..69c3fc1 100644 --- a/gnuplot-4.4.0-demo.dif +++ b/gnuplot-4.4.0-demo.dif @@ -223,33 +223,57 @@ pause -1 "Hit return to continue" reset +--- src/show.c ++++ src/show.c 2010-05-10 14:04:43.814925577 +0200 +@@ -1054,6 +1054,15 @@ show_version(FILE *fp) + p /* hit 'h' */ + ); + ++#ifdef GNUPLOT_LIB_DEFAULT ++ { ++ 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); ++ } ++ } ++#endif + + /* show version long */ + if (almost_equals(c_token, "l$ong")) { --- src/variable.c +++ src/variable.c 2009-06-15 12:01:39.000000000 +0000 -@@ -37,7 +37,7 @@ static char *RCSid() { return RCSid("$Id +@@ -37,7 +37,10 @@ static char *RCSid() { return RCSid("$Id /* The Death of Global Variables - part one. */ #include - +#include ++#include ++#include ++#include #include "variable.h" #include "alloc.h" -@@ -95,6 +95,14 @@ loadpath_handler(int action, char *path) +@@ -95,6 +98,17 @@ loadpath_handler(int action, char *path) if (!loadpath) { char *envlib = getenv("GNUPLOT_LIB"); +#ifdef GNUPLOT_LIB_DEFAULT + char *defenvlib = (char*)0; -+ if (envlib) { -+ if (asprintf(&defenvlib, "%s:%s", envlib, GNUPLOT_LIB_DEFAULT) > 0) -+ envlib = defenvlib; -+ } else -+ envlib = GNUPLOT_LIB_DEFAULT; ++ struct stat st; ++ if ((stat(GNUPLOT_LIB_DEFAULT, &st) == 0) && S_ISDIR(st.st_mode)) { ++ if (envlib) { ++ if (asprintf(&defenvlib, "%s:%s", envlib, GNUPLOT_LIB_DEFAULT) > 0) ++ envlib = defenvlib; ++ } else ++ envlib = GNUPLOT_LIB_DEFAULT; ++ } +#endif /* GNUPLOT_LIB_DEFAULT */ if (envlib) { int len = strlen(envlib); loadpath = gp_strdup(envlib); -@@ -103,6 +111,10 @@ loadpath_handler(int action, char *path) +@@ -103,6 +117,10 @@ loadpath_handler(int action, char *path) /* convert all PATHSEPs to \0 */ PATHSEP_TO_NUL(loadpath); } /* else: NULL = empty */ diff --git a/gnuplot-4.4.0.dif b/gnuplot-4.4.0.dif index e2a8492..08c6cb5 100644 --- a/gnuplot-4.4.0.dif +++ b/gnuplot-4.4.0.dif @@ -76,6 +76,17 @@ %c l . %Touche fléchée@Fonction %_ +--- src/gadgets.h ++++ src/gadgets.h 2010-05-10 10:57:45.850924766 +0000 +@@ -389,7 +389,7 @@ extern TBOOLEAN clip_lines1; + extern TBOOLEAN clip_lines2; + extern TBOOLEAN clip_points; + +-#define SAMPLES 100 /* default number of samples for a plot */ ++#define SAMPLES 500 /* default number of samples for a plot */ + extern int samples_1; + extern int samples_2; + --- src/gplt_x11.c +++ src/gplt_x11.c 2009-05-09 11:32:24.000000000 +0000 @@ -2256,8 +2256,11 @@ exec_cmd(plot_struct *plot, char *comman diff --git a/gnuplot.changes b/gnuplot.changes index 5857308..f7a0db1 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 9 00:00:00 CEST 2010 - dieter.jurzitza@t-online.de + +- Fix AppDefDir vs. XAPPLRESDIR inconsistency, increase default number of samples. + ------------------------------------------------------------------- Wed Apr 7 10:50:19 CEST 2010 - werner@suse.de diff --git a/gnuplot.spec b/gnuplot.spec index 5cd0ac1..6af3cb2 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -35,7 +35,7 @@ License: BSD3c(or similar) Group: Productivity/Graphics/Visualization/Graph AutoReqProv: on Version: 4.4.0 -Release: 1 +Release: 2 Summary: GNUplot a Function Plotting Utility Source0: gnuplot-%{version}.tar.bz2 Source2: gnuplot-fr.doc.bz2 @@ -113,7 +113,7 @@ test $? -eq 0 || exit 1 aclocal -I m4 autoconf ./configure \ - --prefix=%{_prefix} \ + --prefix=%{_prefix} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --libexecdir=%{_libdir} \ @@ -122,6 +122,7 @@ test $? -eq 0 || exit 1 --with-x \ --x-includes=%{_x11inc} \ --x-libraries=%{_x11lib}\ + --with-x-app-defaultdir=%{_appdef}\ --with-readline=gnu \ --enable-history-file \ --with-linux-vga \