- acfix patch updated to work with autoconf 2.53

- linpng 1.2.2 support
- release 16

Changed files:
    gnuplot-acfix.patch -> 1.2
    gnuplot.spec -> 1.42

diff --git a/gnuplot-acfix.patch b/gnuplot-acfix.patch
index ad25e465975251d5d913d7a01ab22de7ad473e4b..ecc28399e85a8e5ed0a0ff6b78267778c0947143 100644 (file)
--- a/gnuplot-acfix.patch
+++ b/gnuplot-acfix.patch
@@ -13,3 +13,23 @@
      builtin and then its argument prototype would still apply.  */
  char $2();
  ]),
+--- gnuplot-3.7.1/configure.in.orig    Thu Aug 19 16:20:19 1999
++++ gnuplot-3.7.1/configure.in Sat Oct 20 21:06:36 2001
+@@ -385,12 +385,12 @@
+ [#ifdef sun
+ yes
+ #endif
+-], AC_CHECK_LIB(suntool, window_create,dnl
+-    AC_CHECK_HEADER(suntool/sunview.h,dnl
+-    AC_DEFINE(SUN, 1,
++], [AC_CHECK_LIB(suntool, window_create,dnl
++    [AC_CHECK_HEADER(suntool/sunview.h,dnl
++    [AC_DEFINE(SUN, 1,
+               [ Define if you want to use the sunview terminal (sun). ])dnl
+-    TERMLIBS="$TERMLIBS -lsuntool -lsunwindow -lpixrect"),,dnl
+-    [-lsunwindow -lpixrect]))
++    TERMLIBS="$TERMLIBS -lsuntool -lsunwindow -lpixrect"])],,dnl
++    [-lsunwindow -lpixrect])])
+ 
+ dnl Process with and enable options
+ 

diff --git a/gnuplot.spec b/gnuplot.spec
index 2f48485d64dc9e9e318594719ba1fd178b047bbc..4e8f66c46b9a54b923565ca7429107a6950cc30a 100644 (file)
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -7,7 +7,7 @@ Summary(pt_BR): Pacote para tra
 Summary(tr):   Matematiksel görselleþtirme paketi
 Name:          gnuplot
 Version:       3.7.1
-Release:       15
+Release:       16
 License:       GPL
 Group:         Applications/Math
 Source0:       http://prdownloads.sourceforge.net/gnuplot/%{name}-%{version}.tar.gz
@@ -15,13 +15,13 @@ Patch0:             %{name}-DESTDIR.patch
 Patch1:                %{name}-info.patch
 Patch2:                %{name}-acfix.patch
 URL:           http://gnuplot.sourceforge.net/
-BuildRequires: readline-devel
-BuildRequires: libpng >= 1.0.8
 BuildRequires: XFree86-devel
-BuildRequires: zlib-devel
-BuildRequires: ncurses-devel
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: libpng >= 1.0.8
+BuildRequires: ncurses-devel
+BuildRequires: readline-devel
+BuildRequires: zlib-devel
 #BuildRequires:        xemacs-lisp-programming
 #or --without-lisp-files
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -69,7 +69,10 @@ aclocal -I m4
 autoconf
 autoheader
 
-%configure \
+if [ -f %{_pkgconfigdir}/libpng12.pc ] ; then
+       CPPFLAGS="`pkg-config libpng12 --cflags`"
+fi
+%configure CPPFLAGS="$CPPFLAGS" \
        --with-readline=gnu \
        --with-png \
        --without-gd \