- 0.2.1, updated fontmap-pld patch, added gd and include patches

NOTE: version 0.1.21 is still required for ImageMagick

Changed files:
    libwmf-fontmap-pld.patch -> 1.2
    libwmf-gd.patch -> 1.1
    libwmf-includes.patch -> 1.1
    libwmf.spec -> 1.30

diff --git a/libwmf-fontmap-pld.patch b/libwmf-fontmap-pld.patch
index 93ac9bb8e471668e3ef514dab68935de9227cee8..7dc9e9ce4a14cc15c2fcc41b0d96a08d430acc8b 100644 (file)
--- a/libwmf-fontmap-pld.patch
+++ b/libwmf-fontmap-pld.patch
@@ -1,14 +1,14 @@
---- libwmf-0.2.0/fonts/libwmf-fontmap.in.orig  Sat May 19 14:12:06 2001
-+++ libwmf-0.2.0/fonts/libwmf-fontmap.in       Mon Jun 11 13:24:44 2001
+--- libwmf-0.2.1/fonts/libwmf-fontmap.in.orig  Sat May 19 14:12:06 2001
++++ libwmf-0.2.1/fonts/libwmf-fontmap.in       Mon Jun 11 13:24:44 2001
 @@ -33,9 +33,9 @@
  fi
  
  if test "x$font_dir" = "x"; then
--      font_dir="@prefix@/share/@PACKAGE@/fonts"
-+      font_dir="@prefix@/share/@PACKAGE@/fonts /usr/share/fonts/Type1 /usr/share/fonts/TTF"
+-      font_dir="@WMF_FONTDIR@"
++      font_dir="@WMF_FONTDIR@ /usr/share/fonts/Type1 /usr/share/fonts/TTF"
  else
--      font_dir="$font_dir @prefix@/share/@PACKAGE@/fonts"
-+      font_dir="$font_dir @prefix@/share/@PACKAGE@/fonts /usr/share/fonts/Type1 /usr/share/fonts/TTF"
+-      font_dir="$font_dir @WMF_FONTDIR@"
++      font_dir="$font_dir @WMF_FONTDIR@ /usr/share/fonts/Type1 /usr/share/fonts/TTF"
  fi
  
  if test $echo_help = yes; then

diff --git a/libwmf-gd.patch b/libwmf-gd.patch
new file mode 100644 (file)
index 0000000..7a149ff
--- /dev/null
+++ b/libwmf-gd.patch
@@ -0,0 +1,11 @@
+--- libwmf-0.2.1/src/ipa/gd.h.orig     Mon May 14 09:27:18 2001
++++ libwmf-0.2.1/src/ipa/gd.h  Thu Aug 30 23:23:09 2001
+@@ -23,7 +23,7 @@
+ /* I suppose I shouldn't call this file gd.h, but as long <gd.h> is included
+  * before any other "gd*.h" there's no problem...
+  */
+-#include <gd.h>
++#include "../extra/gd/gd.h"
+ 
+ extern int gdImageBoundsSafe (gdImage*,int,int);
+ 

diff --git a/libwmf-includes.patch b/libwmf-includes.patch
new file mode 100644 (file)
index 0000000..1823c0e
--- /dev/null
+++ b/libwmf-includes.patch
@@ -0,0 +1,10 @@
+--- libwmf-0.2.1/src/ipa/Makefile.am.orig      Sun Jul 15 18:11:57 2001
++++ libwmf-0.2.1/src/ipa/Makefile.am   Sat Sep  1 12:14:53 2001
+@@ -1,5 +1,7 @@
+ CFLAGS = @CFLAGS@ @WMF_CFLAGS@
+ 
++DEFAULT_INCLUDES =
++
+ LDFLAGS = @LDFLAGS@
+ 
+ DEFS = @DEFS@ @WMF_DEFS@ \

diff --git a/libwmf.spec b/libwmf.spec
index 07ab75f5d528faffa6649ca22b80ea4fa1fbae96..0c33795883424464dd0b2d95e97b5a6eb2257d29 100644 (file)
--- a/libwmf.spec
+++ b/libwmf.spec
@@ -1,7 +1,7 @@
 Summary:       libwmf - library to convert wmf files
 Summary(pl):   libwmf - biblioteka z funkcjami do konwersji plików wmf
 Name:          libwmf
-Version:       0.2.0
+Version:       0.2.1
 Release:       1
 Epoch:         2
 License:       GPL
@@ -12,6 +12,8 @@ Group(fr):    Utilitaires/Texte
 Group(pl):     Aplikacje/Tekst
 Source0:       ftp://download.sourceforge.net/pub/sourceforge/wvware/%{name}-%{version}.tar.gz
 Patch0:                %{name}-fontmap-pld.patch
+Patch1:                %{name}-gd.patch
+Patch2:                %{name}-includes.patch
 URL:           http://wvware.sourceforge.net/
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
@@ -19,6 +21,8 @@ BuildRequires:        freetype-devel >= 2.0
 BuildRequires: XFree86-devel
 BuildRequires: expat-devel
 BuildRequires: libplot-devel
+BuildRequires: autoconf
+BuildRequires: automake
 Prereq:                /sbin/ldconfig
 Prereq:                sed
 Prereq:                ghostscript-fonts-std
@@ -67,9 +71,15 @@ Pakiet zawiera statyczn
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
+libtoolize --copy --force
+aclocal
+automake -a -c
+autoconf
 %configure \
        --with-plot
 %{__make}
@@ -79,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_prefix}/doc ./html-doc
+mv -f $RPM_BUILD_ROOT%{_datadir}/doc ./html-doc
 gzip -9nf CREDITS ChangeLog README TODO
 
 %clean