- added ac25x patch needed for autoconf 2.53/automake 1.6

- libpng 1.2.2 support

Changed files:
    wv-ac25x.patch -> 1.1
    wv.spec -> 1.31

diff --git a/wv-ac25x.patch b/wv-ac25x.patch
new file mode 100644 (file)
index 0000000..f1a458b
--- /dev/null
+++ b/wv-ac25x.patch
@@ -0,0 +1,36 @@
+--- wv-0.7.1/configure.ac.orig Sun Apr 28 13:41:33 2002
++++ wv-0.7.1/configure.ac      Sun Apr 28 13:44:30 2002
+@@ -688,19 +688,17 @@
+ dnl end of possible optimization tests
+ 
+ dnl check for getopt
+-AC_CHECK_FUNC(getopt_long, , [LIBOBJS="$LIBOBJS getopt1.o getopt.o"])
++AC_CHECK_FUNC(getopt_long, , [AC_LIBOBJ([getopt1]); AC_LIBOBJ([getopt])])
+ dnl check for strerror
+-AC_CHECK_FUNC(strerror, , [LIBOBJS="$LIBOBJS strerror.o"])
++AC_CHECK_FUNC(strerror, , [AC_LIBOBJ([strerror])])
+ dnl check for strcasecmp
+-AC_CHECK_FUNC(strcasecmp, , [LIBOBJS="$LIBOBJS strcasecmp.o"])
++AC_CHECK_FUNC(strcasecmp, , [AC_LIBOBJ([strcasecmp])])
+ AC_EGREP_HEADER(strcasecmp,string.h,,AC_DEFINE(DEFINE_STRCASECMP,1,[Define this if strcasecmp must be defined]))
+ dnl check for memcpy, if not there we'll use bcopy
+ AC_CHECK_FUNCS(memcpy)
+ dnl check for mmap
+ AC_FUNC_MMAP
+ 
+-AC_SUBST(LIBOBJS)
+-
+ AH_BOTTOM([
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+--- wv-0.7.1/help/man/GNUmakefile.am.orig      Tue Jan 15 10:58:17 2002
++++ wv-0.7.1/help/man/GNUmakefile.am   Sun Apr 28 13:46:37 2002
+@@ -3,7 +3,7 @@
+ MANPAGES = wvWare.1 wvHtml.1 wvLatex.1 wvCleanLatex.1 wvDVI.1 wvPS.1 wvPDF.1 wvText.1 wvWml.1 wvAbw.1 wvRTF.1 \
+       wvMime.1 wvVersion.1 wvSummary.1
+ 
+-man_DATA = $(MANPAGES)
++man_MANS = $(MANPAGES)
+ 
+ EXTRA_DIST = $(MANPAGES)
+ 

diff --git a/wv.spec b/wv.spec
index 546db045943e48f195d9f509a96112f095a3adbf..64643a8eab81f0f506be9138ba440eb52c7e8761 100644 (file)
--- a/wv.spec
+++ b/wv.spec
@@ -4,12 +4,13 @@ Summary(pl):  Konwerter domument
 Summary(pt_BR):        Conversor de arquivos formato Word (6/7/8/9) para html
 Name:          wv
 Version:       0.7.1
-Release:       2
+Release:       3
 License:       GPL
 Group:         Applications/Text
 Vendor:                Caolan McNamara <Caolan.McNamara@ul.ie>
 Source0:       http://download.sourceforge.net/wvware/%{name}-%{version}.tar.gz
 Patch0:                %{name}-magick.patch
+Patch1:                %{name}-ac25x.patch
 URL:           http://www.wvWare.com/
 BuildRequires: XFree86-devel
 BuildRequires: ImageMagick-devel
@@ -20,7 +21,6 @@ BuildRequires:        glib-devel
 BuildRequires: libtool
 BuildRequires: libwmf-devel >= 0.2.2
 #BuildRequires:        libxml2-devel
-BuildRequires: autoconf
 Obsoletes:     mswordview
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -70,6 +70,7 @@ Pakiet zawiera statyczne biblioteki wv.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Checking for CVS specific files and removing them.
 find . -type d -name 'CVS'| xargs rm -rf
@@ -81,8 +82,11 @@ aclocal
 autoconf
 autoheader
 automake -a -c -i
-CPPFLAGS="-I/usr/X11R6/include/X11"; export CPPFLAGS
-%configure \
+CPPFLAGS="-I/usr/X11R6/include/X11"
+if [ -f %{_pkgconfigdir}/libpng12.pc ] ; then
+       CPPFLAGS="$CPPFLAGS `pkg-config libpng12 --cflags`"
+fi
+%configure CPPFLAGS="$CPPFLAGS" \
        --with-exporter \
        --with-zlib \
        --with-png \