- updated to 0.6.5, updated DESTDIR patch

- libwmf support disabled (requires not-yet-existent libwmf >= 0.2.0)
- magick patch to link with ImageMagick (note workaround: run magick test
  before png test - define HasPNG confused autoconf)

Changed files:
    wv-DESTDIR.patch -> 1.7
    wv-magick.patch -> 1.1
    wv.spec -> 1.22

diff --git a/wv-DESTDIR.patch b/wv-DESTDIR.patch
index a85c8854b4cbdf42e37fd7c420be331473622382..28827a6f605a8bea67208a483d81fb128205ac7c 100644 (file)
--- a/wv-DESTDIR.patch
+++ b/wv-DESTDIR.patch
@@ -1,7 +1,6 @@
-diff -ur wv/Makefile.in wv.DESTDIR/Makefile.in
---- wv/Makefile.in     Mon Jan 22 00:54:18 2001
-+++ wv.DESTDIR/Makefile.in     Mon Mar 12 19:31:21 2001
-@@ -417,15 +417,15 @@
+--- wv-0.6.5.orig/Makefile.in  Sat May  5 19:52:01 2001
++++ wv-0.6.5/Makefile.in       Tue May 22 03:11:15 2001
+@@ -418,15 +418,15 @@
        @(cd exporter && $(MAKE) realclean) || exit 1
  
  installdirs:
@@ -26,7 +25,7 @@ diff -ur wv/Makefile.in wv.DESTDIR/Makefile.in
  
  install: installdirs all
        chmod +x $(srcdir)/wvHtml
-@@ -434,55 +434,54 @@
+@@ -435,56 +435,56 @@
        chmod +x $(srcdir)/wvWml
        chmod +x $(srcdir)/wvCleanLatex
        chmod +x $(srcdir)/wvAbw        
@@ -35,6 +34,7 @@ diff -ur wv/Makefile.in wv.DESTDIR/Makefile.in
 -      $(INSTALL) $(srcdir)/wvVersion$(EXEEXT) $(bindir)/wvVersion$(EXEEXT)
 -      $(INSTALL) $(srcdir)/wvConvert$(EXEEXT) $(bindir)/wvConvert$(EXEEXT)
 -      $(INSTALL) $(srcdir)/wvWare$(EXEEXT) $(bindir)/wvWare$(EXEEXT)
+-      $(INSTALL) $(srcdir)/wvRTF$(EXEEXT) $(bindir)/wvRTF$(EXEEXT)
 -      $(INSTALL) $(srcdir)/wvCleanLatex $(bindir)/wvCleanLatex
 -      $(INSTALL) $(srcdir)/wvHtml $(bindir)/wvHtml
 -      $(INSTALL) $(srcdir)/wvAbw $(bindir)/wvAbw
@@ -66,7 +66,7 @@ diff -ur wv/Makefile.in wv.DESTDIR/Makefile.in
 -      $(INSTALL_DATA) $(src_mandir)/wvSummary.1 $(mandir)/man1/
 -      $(INSTALL_DATA) wv.h $(includedir)/wv.h
 -      $(INSTALL_DATA) exporter/wvexporter.h $(includedir)/wvexporter.h
--      $(INSTALL_DATA) $(srcdir)/libwv.a $(datadir)/libwv.a
+-      $(INSTALL_DATA) $(srcdir)/libwv.a $(libdir)/libwv.a
 -      $(INSTALL_DATA) $(src_xmldir)/wvText.xml $(datadir)/wv/wvText.xml
 -      $(INSTALL_DATA) $(src_xmldir)/wvHtml.xml $(datadir)/wv/wvHtml.xml
 -      $(INSTALL_DATA) $(src_xmldir)/wvLaTeX.xml $(datadir)/wv/wvLaTeX.xml
@@ -79,6 +79,7 @@ diff -ur wv/Makefile.in wv.DESTDIR/Makefile.in
 +      $(INSTALL) $(srcdir)/wvVersion$(EXEEXT) $(DESTDIR)$(bindir)/wvVersion$(EXEEXT)
 +      $(INSTALL) $(srcdir)/wvConvert$(EXEEXT) $(DESTDIR)$(bindir)/wvConvert$(EXEEXT)
 +      $(INSTALL) $(srcdir)/wvWare$(EXEEXT) $(DESTDIR)$(bindir)/wvWare$(EXEEXT)
++      $(INSTALL) $(srcdir)/wvRTF$(EXEEXT) $(DESTDIR)$(bindir)/wvRTF$(EXEEXT)
 +      $(INSTALL) $(srcdir)/wvCleanLatex $(DESTDIR)$(bindir)/wvCleanLatex
 +      $(INSTALL) $(srcdir)/wvHtml $(DESTDIR)$(bindir)/wvHtml
 +      $(INSTALL) $(srcdir)/wvAbw $(DESTDIR)$(bindir)/wvAbw
@@ -103,6 +104,7 @@ diff -ur wv/Makefile.in wv.DESTDIR/Makefile.in
 +      $(INSTALL_DATA) $(src_mandir)/wvWml.1 $(DESTDIR)$(mandir)/man1/
 +      $(INSTALL_DATA) $(src_mandir)/wvAbw.1 $(DESTDIR)$(mandir)/man1/
 +      $(INSTALL_DATA) $(src_mandir)/wvRTF.1 $(DESTDIR)$(mandir)/man1/
++      $(RM) -f $(DESTDIR)$(mandir)/man1/wvConvert.1
 +      echo ".so wvWare.1" > $(DESTDIR)$(mandir)/man1/wvConvert.1      
 +      $(INSTALL_DATA) $(src_mandir)/wvMime.1 $(DESTDIR)$(mandir)/man1/
 +      $(INSTALL_DATA) $(src_mandir)/wvVersion.1 $(DESTDIR)$(mandir)/man1/
@@ -127,18 +129,3 @@ diff -ur wv/Makefile.in wv.DESTDIR/Makefile.in
        done
  
  
-Only in wv.DESTDIR: Makefile.in~
-diff -ur wv/configure.in wv.DESTDIR/configure.in
---- wv/configure.in    Wed Jan 24 04:09:14 2001
-+++ wv.DESTDIR/configure.in    Mon Mar 12 19:27:46 2001
-@@ -102,7 +102,8 @@
- if test [ "$no_x" = yes ]; then
-       X11=""
- else
--      X11="-lX11" 
-+      LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-+      X11="-L/usr/X11R6/lib -lX11" 
- fi
- 
- AC_SUBST(X11)
-Only in wv.DESTDIR: configure.in~

diff --git a/wv-magick.patch b/wv-magick.patch
new file mode 100644 (file)
index 0000000..998d578
--- /dev/null
+++ b/wv-magick.patch
@@ -0,0 +1,178 @@
+diff -Nur wv-0.6.5.orig/Makefile.in wv-0.6.5/Makefile.in
+--- wv-0.6.5.orig/Makefile.in  Tue May 22 15:12:16 2001
++++ wv-0.6.5/Makefile.in       Tue May 22 16:02:07 2001
+@@ -82,7 +82,7 @@
+ 
+ VPATH = @srcdir@
+ 
+-CFLAGS = @CPPFLAGS@ @CFLAGS@ @DEFS@ @ZLIB_CFLAGS@ @GLIB_CFLAGS@ -ansi -pedantic -I. -I./ -I$(srcdir)/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ -DXMLCONFIG=\"$(datadir)/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(datadir)/wv/wvHtml.xml\" -I$(srcdir)/libole2/ -I$(srcdir)/oledecod/ @WMF_CFLAGS@ @ICONV_CFLAGS@
++CFLAGS = @CPPFLAGS@ @CFLAGS@ @DEFS@ @ZLIB_CFLAGS@ @GLIB_CFLAGS@ -ansi -pedantic -I. -I./ -I$(srcdir)/ @MAGICK_CFLAGS@ -I$(srcdir)/expat/xmlparse/ -DXMLCONFIG=\"$(datadir)/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(datadir)/wv/wvHtml.xml\" -I$(srcdir)/libole2/ -I$(srcdir)/oledecod/ @WMF_CFLAGS@ @ICONV_CFLAGS@
+ 
+ ifneq ($(HAVE_GLIB),1)
+ CFLAGS += "-I$(srcdir)/glib-wv/"
+diff -Nur wv-0.6.5.orig/bmptopng.c wv-0.6.5/bmptopng.c
+--- wv-0.6.5.orig/bmptopng.c   Tue Apr 10 18:51:24 2001
++++ wv-0.6.5/bmptopng.c        Tue May 22 16:02:59 2001
+@@ -1,4 +1,4 @@
+-#include "magick/magick.h"
++#include <magick/magick.h>
+ #include <string.h>
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+@@ -23,7 +23,7 @@
+     GetImageInfo (&image_info);
+     sprintf (buffer, "%s.bmp", prefix);
+     strcpy (image_info.filename, buffer);
+-    image = ReadBMPImage (&image_info);
++    image = ReadImage (&image_info);
+     if (image == (Image *) NULL)
+       return (1);
+     sprintf (buffer, "%s.png", prefix);
+@@ -31,7 +31,7 @@
+     strcpy (image_info.filename, buffer);
+     SetImageInfo (&image_info, 1);
+     strcpy (image->filename, buffer);
+-    WritePNGImage (&image_info, image);
++    WriteImage (&image_info, image);
+ 
+     DestroyImage (image);
+     return (0);
+diff -Nur wv-0.6.5.orig/configure.in wv-0.6.5/configure.in
+--- wv-0.6.5.orig/configure.in Tue May  1 23:34:08 2001
++++ wv-0.6.5/configure.in      Tue May 22 16:02:07 2001
+@@ -165,6 +165,67 @@
+ AC_SUBST(ZLIB_CFLAGS)
+ AC_SUBST(ZLIB_LIBS)
+ 
++dnl ========================================================
++dnl test for imagemagick
++dnl test for the existence of the MagickConfig program,
++dnl if its not there then we dont have imagemagick, if it
++dnl is there then we still have to do a big dance to get
++dnl something to link against it as it does not provide all
++dnl the information that we need to compile against it
++dnl first try it raw, maybe the author will have fixed it
++dnl by now, then try it with the prefix attached, and then
++dnl try it with the X varient of that, and then try it with
++dnl both.
++
++_cppflags="$CPPFLAGS"
++_ldflags="$LDFLAGS"
++
++AC_ARG_WITH(Magick,
++[  --with-Magick=DIR       use Magick in DIR],[
++    if test "$withval" != "no"; then
++        MAGICK_DIR=$withval
++        CPPFLAGS="$CPPFLAGS -I$withval/include"
++        LDFLAGS="$LDFLAGS -L$withval/lib"
++    fi
++])
++
++if test -n "$MAGICK_DIR"; then
++    AC_PATH_PROG(MAGICK_CONFIG, Magick-config, ,
++    [$MAGICK_DIR:$MAGICK_DIR/bin:$PATH])
++else
++    AC_PATH_PROG(MAGICK_CONFIG, Magick-config)
++fi
++
++if test -n "$MAGICK_CONFIG"; then
++    m_cppflags="`$MAGICK_CONFIG --cppflags`"
++    m_ldflags="`$MAGICK_CONFIG --ldflags`"
++
++    CPPFLAGS="$CPPFLAGS $m_cppflags"
++    LDFLAGS="$LDFLAGS $m_ldflags"
++
++    AC_CHECK_HEADER(magick/magick.h,
++        AC_CHECK_LIB(Magick, GetImageInfo,[
++            MAGICK_CFLAGS="$m_cppflags"
++            MAGICK_LIBS="$m_ldflags -lMagick"
++            MAGICK=" "
++            MAGICKOBJS=""]))
++fi
++
++if test -z "$MAGICK"; then
++      MAGICK="MAGICK"
++      MAGICK_CFLAGS="-I\$(srcdir)/magick"
++      MAGICK_LIBS=""
++      MAGICKOBJS="\$(RMAGICKOBJS)"
++fi
++
++CPPFLAGS="$_cppflags"
++LDFLAGS="$_ldflags"
++
++AC_SUBST(MAGICK_CFLAGS)
++AC_SUBST(MAGICK_LIBS)
++AC_SUBST(MAGICK)
++AC_SUBST(MAGICKOBJS)
++
+ dnl system png support
+ dnl ========================================================
+ _cppflags=${CPPFLAGS}
+@@ -417,67 +478,6 @@
+ 
+ dnl end of iconv
+ dnl ========================================================
+-
+-dnl ========================================================
+-dnl test for imagemagick
+-dnl test for the existence of the MagickConfig program,
+-dnl if its not there then we dont have imagemagick, if it
+-dnl is there then we still have to do a big dance to get
+-dnl something to link against it as it does not provide all
+-dnl the information that we need to compile against it
+-dnl first try it raw, maybe the author will have fixed it
+-dnl by now, then try it with the prefix attached, and then
+-dnl try it with the X varient of that, and then try it with
+-dnl both.
+-
+-_cppflags=$CPPFLAGS
+-_ldflags=$LDFLAGS
+-
+-AC_ARG_WITH(Magick,
+-[  --with-Magick=DIR       use Magick in DIR],[
+-    if test "$withval" != "no"; then
+-        MAGICK_DIR=$withval
+-        CPPFLAGS="$CPPFLAGS -I$withval/include"
+-        LDFLAGS="$LDFLAGS -L$withval/lib"
+-    fi
+-])
+-
+-if test -n "$MAGICK_DIR"; then
+-    AC_PATH_PROG(MAGICK_CONFIG, Magick-config, ,
+-    [$MAGICK_DIR:$MAGICK_DIR/bin:$PATH])
+-else
+-    AC_PATH_PROG(MAGICK_CONFIG, Magick-config)
+-fi
+-
+-if test -n "$MAGICK_CONFIG"; then
+-    m_cppflags=`$MAGICK_CONFIG --cppflags`
+-    m_ldflags=`$MAGICK_CONFIG --ldflags`
+-
+-    CPPFLAGS="$CPPFLAGS $m_cppflags"
+-    LDFLAGS="$LDFLAGS $m_ldflags"
+-
+-    AC_CHECK_HEADER(magick/magick.h,
+-        AC_CHECK_LIB(Magick, GetImageInfo,[
+-            MAGICK_CFLAGS=$m_cppflags
+-            MAGICK_LIBS=$m_ldflags
+-            MAGICK="MAGICK"
+-            MAGICKOBJS="\$(RMAGICKOBJS)"]))
+-fi
+-
+-if test -z "$MAGICK"; then
+-      MAGICK="MAGICK"
+-      MAGICK_CFLAGS="-I./magick"
+-      MAGICK_LIBS=""
+-      MAGICKOBJS="\$(RMAGICKOBJS)"
+-fi
+-
+-CPPFLAGS=$_cppflags
+-LDFLAGS=$_ldflags
+-
+-AC_SUBST(MAGICK_CFLAGS)
+-AC_SUBST(MAGICK_LIBS)
+-AC_SUBST(MAGICK)
+-AC_SUBST(MAGICKOBJS)
+ 
+ dnl ========================================================
+ dnl begin of possible optimization tests

diff --git a/wv.spec b/wv.spec
index ac4d9174b0319d6b0253f102a49457791c74ce85..28d83fbeccbbd90842cd41ce57375bdfd714c72f 100644 (file)
--- a/wv.spec
+++ b/wv.spec
@@ -1,8 +1,8 @@
 Summary:       MSWord Document to HTML converter
 Summary(pl):   Konwerter domumentów MSWord do HTML
 Name:          wv
-Version:       0.6.4
-Release:       3
+Version:       0.6.5
+Release:       1
 License:       GPL
 Group:         Applications/Text
 Group(de):     Applikationen/Text
@@ -11,6 +11,7 @@ Group(pl):    Aplikacje/Tekst
 Vendor:                Caolan McNamara <Caolan.McNamara@ul.ie>
 Source0:       http://download.sourceforge.net/wvware/%{name}-%{version}.tar.gz
 Patch0:                %{name}-DESTDIR.patch
+Patch1:                %{name}-magick.patch
 URL:           http://www.wvWare.com/
 BuildRequires: XFree86-devel
 BuildRequires: ImageMagick-devel
@@ -18,9 +19,10 @@ BuildRequires:       autoconf
 BuildRequires: freetype1-devel
 BuildRequires: gd-devel
 BuildRequires: glib-devel
-BuildRequires: libwmf-devel >= 0.1.21b-3
+#BuildRequires:        libwmf-devel >= 0.1.21b-3
 #BuildRequires:        libxml2-devel
 BuildRequires: iconv
+BuildRequires: autoconf
 Requires:      iconv
 Obsoletes:     mswordview
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,7 +44,7 @@ Worda do HTML.
 
 %package devel
 Summary:       Include files needed to compile
-Summary(pl):   Pliki nag³ówkowe do biblioteki 
+Summary(pl):   Pliki nag³ówkowe do biblioteki wv
 Group:         Development/Libraries
 Group(de):     Entwicklung/Libraries
 Group(fr):     Development/Librairies
@@ -53,11 +55,11 @@ Requires:   %{name} = %{version}
 Contains the header files.
 
 %description -l pl devel
-Pakiet tem zawiera pliki nag³ówkowe.
+Pakiet tem zawiera pliki nag³ówkowe wv.
 
 %package static
-Summary:       Static libraries
-Summary(pl):   Biblioteki statyczne
+Summary:       Static wv libraries
+Summary(pl):   Biblioteki statyczne wv
 Group:         Libraries
 Group(de):     Libraries
 Group(es):     Bibliotecas
@@ -66,33 +68,27 @@ Group(pl):  Biblioteki
 Requires:      %{name}-devel = %{version}
 
 %description static
-Contains static libraries.
+Contains static wv libraries.
 
 %description -l pl static
-Pakiet zawiera statyczne biblioteki.
+Pakiet zawiera statyczne biblioteki wv.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Checking for CVS specific files and removing them.
 find . -type d -name 'CVS'| xargs rm -rf
 
 %build
-for var in HAVE_TTF HAVE_WMF HAVE_XPM HAVE_ZLIB HasPNG MATCHED_TYPE \
-       MUST_USE_INTERNAL_ICONV_TABLE USE_ICONV USE_X XML_BYTE_ORDER \
-       HAVE_GLIB HAVE_LIBXML2 ; do
-               echo "#undef $var" >> acconfig.h
-done
-autoheader
+autoconf
 %configure \
        --with-exporter \
        --with-zlib \
        --with-png \
-       --with-Magick \
-       --with-xpm=/usr/X11R6
-
-echo "#define SYSTEM_ZLIB" >> config.h
+       --with-Magick
+#      --with-libwmf
 
 %{__make}
 
@@ -102,14 +98,14 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-gzip -9nf helper-scripts/*
+gzip -9nf CHANGELOG CREDITS D_CREDITS D_README KNOWN-BUGS README TESTING TODO.TXT
 
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc helper-scripts
+%doc *.gz
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/wv
 %{_mandir}/man*/*