- up to 4.6.0

- 4.4.1-mp.patch fixed upstream
- bcond for Qt terminal

Changed files:
    gnuplot-4.4.1-mp.patch -> 1.2
    gnuplot-lua.patch -> 1.4
    gnuplot.spec -> 1.95

diff --git a/gnuplot-4.4.1-mp.patch b/gnuplot-4.4.1-mp.patch
deleted file mode 100644 (file)
index ddacb79..0000000
--- a/gnuplot-4.4.1-mp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up gnuplot-4.4.1/man/gnuplot.1.pom gnuplot-4.4.1/man/gnuplot.1
---- gnuplot-4.4.1/man/gnuplot.1.pom    2009-02-18 05:03:52.000000000 +0100
-+++ gnuplot-4.4.1/man/gnuplot.1        2010-09-24 14:58:00.000000000 +0200
-@@ -236,8 +236,8 @@ gnuplot.  None of these are required.
- .TP
- .B GNUTERM
- The name of the terminal type to be used.  This overrides any terminal
--type sensed by gnuplot on start-up, but is itself overridden by the
--.gnuplot (or equivalent) start-up file (see \fBFILES\fP and "help
-+type sensed by gnuplot on start-up, but is itself overridden by the .gnuplot
-+(or equivalent) start-up file (see \fBFILES\fP and "help
- start-up") and, of course, by later explicit changes.
- .TP
- .B GNUHELP 
-diff -up gnuplot-4.4.1/man/.pom gnuplot-4.4.1/man/

diff --git a/gnuplot-lua.patch b/gnuplot-lua.patch
index 567e7c482a5da42ed65c889fd35bfade08b72074..34ccadac377940389fcefb1401ec596357fb2bd6 100644 (file)
--- a/gnuplot-lua.patch
+++ b/gnuplot-lua.patch
@@ -1,11 +1,11 @@
 --- gnuplot-4.4.3/configure.in.orig    2011-02-20 21:43:31.000000000 +0100
 +++ gnuplot-4.4.3/configure.in 2011-03-16 15:09:34.731414618 +0100
-@@ -649,7 +649,7 @@
+@@ -680,7 +680,7 @@
    [test -z "${with_lua}" && with_lua=yes])
  
  if test "${with_lua}" = yes ; then
--  PKG_CHECK_MODULES(LUA, [lua], LUAFOUND=yes, [LUAFOUND=no])
-+  PKG_CHECK_MODULES(LUA, [lua51], LUAFOUND=yes, [LUAFOUND=no])
+-  PKG_CHECK_MODULES(LUA, [lua], LUAFOUND=yes, [PKG_CHECK_MODULES(LUA, [lua5.1], LUAFOUND=yes, [LUAFOUND=no])])
++  PKG_CHECK_MODULES(LUA, [lua51], LUAFOUND=yes, [PKG_CHECK_MODULES(LUA, [lua5.1], LUAFOUND=yes, [LUAFOUND=no])])
    if test $pkg_failed != no; then
      AC_MSG_WARN([Could not find support for lua using pkg-config.])
      with_lua=no

diff --git a/gnuplot.spec b/gnuplot.spec
index 0498b837cd3ce9055e169d3aaa693417e71e32ec..fe4c68a60a29b90a054927bdc5e9969906d47955 100644 (file)
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -1,3 +1,7 @@
+
+# Conditional build:
+%bcond_with    qt      # build Qt terminal
+
 Summary:       A program for plotting mathematical expressions and data
 Summary(de.UTF-8):     GNU-Plotter-Paket
 Summary(es.UTF-8):     Paquete para trazar gráficos
@@ -9,20 +13,25 @@ Summary(ru.UTF-8):   Программа для построения графико
 Summary(tr.UTF-8):     Matematiksel görselleştirme paketi
 Summary(uk.UTF-8):     Програма для побудови графіків математичних виразів та даних
 Name:          gnuplot
-Version:       4.4.3
+Version:       4.6.0
 Release:       1
 License:       distributable (with modifications properly marked if any)
 Group:         Applications/Math
 Source0:       http://downloads.sourceforge.net/gnuplot/%{name}-%{version}.tar.gz
-# Source0-md5: 639603752996f4923bc02c895fa03b45
+# Source0-md5: 8e6e92b4596ea0eb75e16a57fc79efec
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-info_install.patch
 Patch2:                %{name}-lua.patch
 Patch3:                %{name}-wx-config.patch
-Patch4:                %{name}-4.4.1-mp.patch
 URL:           http://gnuplot.sourceforge.net/
+%if %{with qt}
+BuildRequires: QtCore-devel >= 4.5
+BuildRequires: QtGui-devel >= 4.5
+BuildRequires: QtNetwork-devel >= 4.5
+BuildRequires: QtSvg-devel >= 4.5
+%endif
 BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake >= 1:1.7.9
 BuildRequires: cairo-devel >= 1.2
@@ -114,7 +123,6 @@ Obsługa gnuplota dla LaTeXa.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p0
-%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -125,6 +133,7 @@ Obsługa gnuplota dla LaTeXa.
 
 %configure \
        --enable-history-file \
+       %{?with_qt:--enable-qt} \
        --with-readline=gnu \
        --with-png \
        --with-gd \