- updated am patch to work with current auto*, added libpng 1.2.2 support

- release 2

Changed files:
    XmHTML-am.patch -> 1.2
    XmHTML.spec -> 1.10

diff --git a/XmHTML-am.patch b/XmHTML-am.patch
index 1a4ad04f25caf0e2c1df5345bd3647ffb1ce81df..8fd12182f8647fca3d3034f417fce192f4ae0623 100644 (file)
--- a/XmHTML-am.patch
+++ b/XmHTML-am.patch
@@ -1,6 +1,14 @@
 diff -Nur XmHTML-1.1.7.orig/configure.in XmHTML-1.1.7/configure.in
 --- XmHTML-1.1.7.orig/configure.in     Wed Feb  3 17:19:48 1999
 +++ XmHTML-1.1.7/configure.in  Sat Mar 17 22:55:03 2001
+@@ -489,6 +489,7 @@
+   for ac_dir in               \
+     /usr/include              \
+     /usr/include/png          \
++    `echo $PNGINC |sed s/-I//`\
+     /usr/local/include        \
+     /usr/png/include          \
+     /usr/unsupported/include  \
 @@ -712,32 +712,12 @@
  fi
  ])
@@ -34,6 +42,25 @@ diff -Nur XmHTML-1.1.7.orig/configure.in XmHTML-1.1.7/configure.in
 -AM_MAINTAINER_MODE
  
  AC_MSG_CHECKING(compiler flags)
+ dnl
+@@ -810,17 +811,8 @@
+ dnl Which output files do we generate ?
+ dnl
+ 
+-AC_OUTPUT(Makefile
++AC_OUTPUT(
+-book/Makefile
+-contrib/Makefile
+-examples/Makefile
+-http/Makefile
+ lib/Makefile
+-lib/common/Makefile
+-lib/compat/Makefile
+-lib/Motif/Makefile
+-lib/gtk/Makefile
+-tools/Makefile
+ )
+ 
  dnl
 diff -Nur XmHTML-1.1.7.orig/include/config.h.in XmHTML-1.1.7/include/config.h.in
 --- XmHTML-1.1.7.orig/include/config.h.in      Wed Feb  3 17:18:32 1999

diff --git a/XmHTML.spec b/XmHTML.spec
index de27790f13209f678d5c31e07d3f35e148c3036e..380905f9a60cbba3884c8f90cb2297daf9f15260 100644 (file)
--- a/XmHTML.spec
+++ b/XmHTML.spec
@@ -2,19 +2,19 @@ Summary:      Motif HTML widget
 Summary(pl):   Widget do HTML oparty o Motif
 Name:          XmHTML
 Version:       1.1.7
-Release:       1
+Release:       2
 License:       LGPL
 Group:         X11/Libraries
 Source0:       http://www.xs4all.nl/~ripley/XmHTML/dist/%{name}-%{version}.tar.gz
 Patch0:                %{name}-am.patch
 Patch1:                %{name}-macro.patch
 URL:           http://www.xs4all.nl/~ripley/XmHTML/
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: lesstif-devel
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: lesstif-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
 BuildRequires: libtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -74,7 +74,7 @@ automake -a -c -f
 CFLAGS="%{rpmcflags} \
        -I`pwd`/include/XmHTML -I`pwd`/include/common \
        %{!?debug:-DNDEBUG -Dproduction} -DVERSION=1107"
-%configure
+%configure PNGINC="`pkg-config --cflags libpng12 2>/dev/null`"
 
 cd lib
 %{__make}