- added ac25x patch needed for autoconf 2.53

- libpng 1.2.2 support
- release 4

Changed files:
    grace-ac25x.patch -> 1.1
    grace.spec -> 1.27

diff --git a/grace-ac25x.patch b/grace-ac25x.patch
new file mode 100644 (file)
index 0000000..cb04925
--- /dev/null
+++ b/grace-ac25x.patch
@@ -0,0 +1,13 @@
+--- grace-5.1.2/ac-tools/configure.in.orig     Sun Apr 28 11:28:51 2002
++++ grace-5.1.2/ac-tools/configure.in  Sun Apr 28 11:30:48 2002
+@@ -625,8 +625,8 @@
+   LIBS="$GUI_LIBS $NOGUI_LIBS"
+ 
+   dnl **** and some - Xpm lib
+-  AC_CHECK_LIB(Xpm,main,GUI_LIBS="-lXpm $GUI_LIBS"; AC_DEFINE(HAVE_XPM)
+-                 AC_CHECK_HEADERS(xpm.h X11/xpm.h))
++  AC_CHECK_LIB(Xpm,main,[GUI_LIBS="-lXpm $GUI_LIBS"; AC_DEFINE(HAVE_XPM)
++                 AC_CHECK_HEADERS(xpm.h X11/xpm.h)])
+ 
+   ACX_RESTORE_STATE
+ 

diff --git a/grace.spec b/grace.spec
index 05766d99983f309b42f9459697e0847e13e52b49..51737157d8bf7ba26770bf1991549092ebfcde01 100644 (file)
--- a/grace.spec
+++ b/grace.spec
@@ -2,7 +2,7 @@ Summary:        Numerical Data Processing and Visualization Tool (grace)
 Summary(pl):   Narzêdzie do numerycznej obróbki i wizualizacji danych
 Name:          grace
 Version:       5.1.2
-Release:       3
+Release:       4
 License:       GPL
 Group:         Applications/Math
 Source0:       ftp://plasma-gate.weizmann.ac.il/pub/grace/src/%{name}-%{version}.tar.gz
@@ -11,23 +11,24 @@ Patch1:             %{name}-HOME-ETC.patch
 Patch2:                %{name}-PDFlib.patch
 Patch3:                %{name}-etc.patch
 Patch4:                %{name}-fontsdir.patch
+Patch5:                %{name}-ac25x.patch
 URL:           http://plasma-gate.weizmann.ac.il/Grace/
+BuildRequires: XFree86-devel
+BuildRequires: Xbae-devel
+BuildRequires: XmHTML-devel >= 1.1.5
+BuildRequires: autoconf
 BuildRequires: fftw-devel
+BuildRequires: lesstif-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel >= 0.9.6
 BuildRequires: libtiff-devel
-BuildRequires: pdflib-devel >= 3.0
-BuildRequires: lesstif-devel
-BuildRequires: XFree86-devel
-BuildRequires: Xbae-devel
-BuildRequires: XmHTML-devel >= 1.1.5
 BuildRequires: netcdf-devel >= 3.0
+BuildRequires: pdflib-devel >= 3.0
 BuildRequires: t1lib-devel
-BuildRequires: autoconf
+Requires:      ghostscript-fonts-std
+Requires:      libpng >= 0.9.6
 Requires:      pdflib >= 3.0
 Requires:      zlib >= 1.0.3
-Requires:      libpng >= 0.9.6
-Requires:      ghostscript-fonts-std
 Obsoletes:     xmgr
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -57,11 +58,15 @@ do publikacji.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 cp -f ac-tools/configure.in .
 autoconf
-%configure \
+if [ -f %{_pkgconfigdir}/libpng12.pc ] ; then
+       CPPFLAGS="`pkg-config libpng12 --cflags`"
+fi
+%configure CPPFLAGS="$CPPFLAGS" \
        --enable-grace-home=%{_datadir}/%{name} \
        --enable-editres \
        --enable-extra-incpath=$PKG_BUILD_DIR/include \