From d390e2136b80a6f64969aa70e417f6af5d0bf98f8be6d9070bb02405bd0a5c30 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 25 May 2010 12:35:23 +0000 Subject: [PATCH] Accepting request 40594 from Publishing checked in (request 40594) OBS-URL: https://build.opensuse.org/request/show/40594 OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=13 --- gnuplot-4.4.0-demo.dif | 8 ++++---- gnuplot.changes | 20 +++++--------------- gnuplot.spec | 2 +- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/gnuplot-4.4.0-demo.dif b/gnuplot-4.4.0-demo.dif index 0b67270..69c3fc1 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-19 21:19:16.000000000 +0200 -@@ -1054,6 +1054,15 @@ ++++ src/show.c 2010-05-10 14:04:43.814925577 +0200 +@@ -1054,6 +1054,15 @@ show_version(FILE *fp) p /* hit 'h' */ ); @@ -233,8 +233,8 @@ + { + struct stat st; + if ((stat(GNUPLOT_LIB_DEFAULT, &st) == 0) && S_ISDIR(st.st_mode)) { -+ 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); ++ 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 diff --git a/gnuplot.changes b/gnuplot.changes index 51e19e5..f7a0db1 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Thu May 20 12:44:38 CEST 2010 - werner@suse.de - -- Correct macro name in spec file - -------------------------------------------------------------------- -Wed May 19 00:00:00 CEST 2010 - dieter.jurzitza@t-online.de - -- Fix format being written into plt files (add missing #) - ------------------------------------------------------------------- Sun May 9 00:00:00 CEST 2010 - dieter.jurzitza@t-online.de @@ -200,7 +190,7 @@ Wed May 30 16:12:19 CEST 2007 - werner@suse.de - Correct datadir - The patent of gif is expired -------------------------------------------------------------------- +------------------------------------------------------------------ Fri May 11 16:52:57 CEST 2007 - werner@suse.de - Use setlocale(..,NULL) instead of gentenv() (bug #272915) @@ -513,7 +503,7 @@ Sun Aug 23 10:51:12 MEST 1998 - bs@suse.de - fixed "neededforbuild" -------------------------------------------------------------------- +---------------------------------------------------------------------------- Mon Jul 13 17:32:27 MET DST 1998 - werner@suse.de - New version: 3.5beta6.347 @@ -521,12 +511,12 @@ Mon Jul 13 17:32:27 MET DST 1998 - werner@suse.de * Some enhancements * Some bug fixes -------------------------------------------------------------------- +---------------------------------------------------------------------------- Thu Oct 23 13:59:59 MET DST 1997 - werner@suse.de - New version: 3.5beta6.336 -------------------------------------------------------------------- +---------------------------------------------------------------------------- Mon Feb 3 23:03:09 MET 1997 - werner@suse.de - Update auf Version 3.5-beta-3.6pl319 @@ -534,7 +524,7 @@ Mon Feb 3 23:03:09 MET 1997 - werner@suse.de von Messdaten. - verschoben von ap1 -> 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 ebf8650..6af3cb2 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -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 %{_exec_prefix}/include +%define _x11inc %{_x11_prefix}/include %define _appdef %{_x11data}/app-defaults %else %define _x11lib %{_libdir}