packages: gnuplot/gnuplot.spec, gnuplot/gnuplot-wx-config.patch (NEW) - up ...

[draenog]

Author: draenog                      Date: Tue Sep 14 17:25:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 4.4.1
- enable wxt terminal
- adapterized

---- Files affected:
packages/gnuplot:
   gnuplot.spec (1.88 -> 1.89) , gnuplot-wx-config.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnuplot/gnuplot.spec
diff -u packages/gnuplot/gnuplot.spec:1.88 packages/gnuplot/gnuplot.spec:1.89
--- packages/gnuplot/gnuplot.spec:1.88	Sat May 29 13:07:47 2010
+++ packages/gnuplot/gnuplot.spec	Tue Sep 14 19:25:42 2010
@@ -10,23 +10,25 @@
 Summary(tr.UTF-8):	Matematiksel görselleştirme paketi
 Summary(uk.UTF-8):	Програма для побудови графіків математичних виразів та даних
 Name:		gnuplot
-Version:	4.4.0
-Release:	0.1
+Version:	4.4.1
+Release:	1
 License:	distributable (with modifications properly marked if any)
 Group:		Applications/Math
-Source0:	http://dl.sourceforge.net/gnuplot/%{name}-%{version}.tar.gz
-# Source0-md5:	e708665bd512153ad5c35252fe499059
+Source0:	http://downloads.sourceforge.net/gnuplot/%{name}-%{version}.tar.gz
+# Source0-md5:	296e2904363e508bd8cb7e8ea1d267e8
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-info_install.patch
 Patch2:		%{name}-lua.patch
+Patch3:		%{name}-wx-config.patch
 URL:		http://gnuplot.sourceforge.net/
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	cairo-devel
 BuildRequires:	gd-devel
 BuildRequires:	glib2-devel
+BuildRequires:	gtk+2-devel
 BuildRequires:	libpng-devel >= 1.0.8
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel
@@ -37,6 +39,7 @@
 BuildRequires:	texlive
 BuildRequires:	texlive-format-pdflatex
 BuildRequires:	texlive-latex
+BuildRequires:	wxGTK2-unicode-devel
 #BuildRequires:	xemacs-lisp-programming
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	zlib-devel
@@ -103,6 +106,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0
 
 %build
 %{__libtoolize}
@@ -139,7 +143,7 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	appdefaultdir=%{_prefix}/share/X11/app-defaults
+	appdefaultdir=%{_datadir}/X11/app-defaults
 
 mv $RPM_BUILD_ROOT%{_datadir}/texmf{,-dist}
 
@@ -162,7 +166,7 @@
 %{_infodir}/gnuplot.info*
 %{_desktopdir}/gnuplot.desktop
 %{_pixmapsdir}/gnuplot.png
-%{_prefix}/share/X11/app-defaults/Gnuplot
+%{_datadir}/X11/app-defaults/Gnuplot
 
 %files latex
 %defattr(644,root,root,755)
@@ -174,6 +178,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.89  2010/09/14 17:25:42  draenog
+- up to 4.4.1
+- enable wxt terminal
+- adapterized
+
 Revision 1.88  2010/05/29 11:07:47  uzsolt
 - latex package
 - remove datadir re-definition

================================================================
Index: packages/gnuplot/gnuplot-wx-config.patch
diff -u /dev/null packages/gnuplot/gnuplot-wx-config.patch:1.1
--- /dev/null	Tue Sep 14 19:25:47 2010
+++ packages/gnuplot/gnuplot-wx-config.patch	Tue Sep 14 19:25:42 2010
@@ -0,0 +1,11 @@
+--- configure.in~	2010-09-13 15:20:15.221134903 +0100
++++ configure.in	2010-09-13 15:24:59.651039243 +0100
+@@ -970,7 +970,7 @@
+      fi ])
+ 
+   dnl Look for wx-config in the path
+-  AC_PATH_PROG(WX_CONFIG, wx-config, no, ${WXWIDGETS_PATH})
++  AC_PATH_PROG(WX_CONFIG, wx-gtk2-unicode-config, no, ${WXWIDGETS_PATH})
+   if test "${WX_CONFIG}" = "no"; then
+     AC_MSG_WARN([wxWidgets can't be found. You can try --with-wx-config-path to give the right path to wx-config. The wxWidgets terminal will not be compiled.])
+     enable_wxwidgets_ok=no
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnuplot/gnuplot.spec?r1=1.88&r2=1.89&f=u