pool/gnuplot
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 100907 from Publishing

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/100907
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnuplot?expand=0&rev=34
This commit is contained in:
Stephan Kulow 2012-01-25 11:18:33 +00:00 committed by Git OBS Bridge
commit e21c52da0a
6 changed files with 66 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gnuplot-4.4.0-wxt.dif
View File

@ -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

19
gnuplot-4.4.1.dif
View File

@ -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(

3
gnuplot-4.4.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e9ad674de420f70ee729eeeb2af5565f1e97b031aa68901ba9454c86834acd4b
size 2746157

3
gnuplot-4.4.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f2fe678cb7f9587dd0cc3b5707484435c1342c209f6cd5b8a74ac405caed0e55
size 2746669

41
gnuplot.changes
View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Tue Dec 13 08:33:16 UTC 2011 - cfarrell@suse.com
- license update: SUSE-Gnuplot and GPL-2.0+
SPDX format (including SUSE prefix for licenses not yet accepted by SPDX
upstream). This is not BSD-3-Clause. The Gnuplot license insists that
modifications to source code be done by patch only. There are GPL-2.0+
components included as aggegation
-------------------------------------------------------------------
Thu Dec 1 16:46:07 UTC 2011 - coolo@suse.com
- add automake as buildrequire to avoid implicit dependency
-------------------------------------------------------------------
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 <g id="Plot_#"><title>...
* 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

35
gnuplot.spec
View File

@ -15,18 +15,30 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: gnuplot
BuildRequires: cairo-devel emacs-nox freetype2-devel gcc-c++ gd-devel gtk2-devel latex2html libjpeg-devel netpbm pango-devel readline-devel texlive-latex xorg-x11 xorg-x11-devel
BuildRequires: automake
BuildRequires: cairo-devel
BuildRequires: emacs-nox
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: gd-devel
BuildRequires: gtk2-devel
BuildRequires: latex2html
BuildRequires: libjpeg-devel
BuildRequires: netpbm
BuildRequires: pango-devel
BuildRequires: readline-devel
BuildRequires: texlive-latex
BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel
%if %suse_version > 1130
BuildRequires: wxWidgets-devel
%else
BuildRequires: wxGTK-devel
%endif
%if 0%{?suse_version} > 1120
BuildRequires: libpng14-devel lua-devel
BuildRequires: libpng14-devel
BuildRequires: lua-devel
%else
BuildRequires: libpng-devel
%endif
@ -36,11 +48,10 @@ BuildRequires: plotutils-devel
BuildRequires: plotutils
%endif
Url: http://www.gnuplot.info/
License: BSD3c(or similar)
License: SUSE-Gnuplot and GPL-2.0+
Group: Productivity/Graphics/Visualization/Graph
AutoReqProv: on
Version: 4.4.3
Release: 1
Version: 4.4.4
Release: 0
Summary: GNUplot a Function Plotting Utility
Source0: gnuplot-%{version}.tar.bz2
Source2: gnuplot-fr.doc.bz2
@ -48,7 +59,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
@ -78,9 +88,7 @@ printers (including many color devices and pseudodevices like LaTeX)
and can easily be extended to include new devices.
%package doc
License: BSD3c(or similar)
Summary: Documentation of GNUplot
Group: Productivity/Graphics/Visualization/Graph
Requires: %{name}
Requires(post): %install_info_prereq
Requires(postun): %install_info_prereq
@ -103,7 +111,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 +127,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} \