packages: gnuplot/gnuplot-lua.patch, gnuplot/gnuplot.spec, gnuplot/gnuplot-...

[draenog]

Author: draenog                      Date: Sat Apr  7 18:52:52 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 4.6.0
- 4.4.1-mp.patch fixed upstream
- bcond for Qt terminal

---- Files affected:
packages/gnuplot:
   gnuplot-lua.patch (1.3 -> 1.4) , gnuplot.spec (1.94 -> 1.95) , gnuplot-4.4.1-mp.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/gnuplot/gnuplot-lua.patch
diff -u packages/gnuplot/gnuplot-lua.patch:1.3 packages/gnuplot/gnuplot-lua.patch:1.4
--- packages/gnuplot/gnuplot-lua.patch:1.3	Wed Mar 16 15:32:47 2011
+++ packages/gnuplot/gnuplot-lua.patch	Sat Apr  7 20:52:47 2012
@@ -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

================================================================
Index: packages/gnuplot/gnuplot.spec
diff -u packages/gnuplot/gnuplot.spec:1.94 packages/gnuplot/gnuplot.spec:1.95
--- packages/gnuplot/gnuplot.spec:1.94	Wed Mar 16 15:32:47 2011
+++ packages/gnuplot/gnuplot.spec	Sat Apr  7 20:52:47 2012
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+
+# 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
@@ -10,20 +14,25 @@
 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
@@ -115,7 +124,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p0
-%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -126,6 +134,7 @@
 
 %configure \
 	--enable-history-file \
+	%{?with_qt:--enable-qt} \
 	--with-readline=gnu \
 	--with-png \
 	--with-gd \
@@ -186,6 +195,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95  2012/04/07 18:52:47  draenog
+- up to 4.6.0
+- 4.4.1-mp.patch fixed upstream
+- bcond for Qt terminal
+
 Revision 1.94  2011/03/16 14:32:47  qboosh
 - updated to 4.4.3
 - updated lua patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/gnuplot/gnuplot-lua.patch?r1=1.3&r2=1.4
    http://cvs.pld-linux.org/packages/gnuplot/gnuplot.spec?r1=1.94&r2=1.95