rh#143096# extra deps according to libwmf-devel

This commit is contained in:
Caolan McNamara 2006-02-28 11:13:42 +00:00
parent a334f51653
commit 3b0f774dd7
2 changed files with 33 additions and 1 deletions

27
libwmf-0.2.8.4-deps.patch Normal file
View File

@ -0,0 +1,27 @@
--- libwmf-0.2.8.3/libwmf-config.in.noextras-2 2004-02-10 06:41:26.000000000 -0600
+++ libwmf-0.2.8.3/libwmf-config.in 2005-07-06 15:18:26.000000000 -0500
@@ -105,7 +105,7 @@
libwmf_buildstyle=@LIBWMF_BUILDSTYLE@
if test $libwmf_buildstyle = heavy; then
- wmf_libs="-lwmf -lwmflite $wmf_liblflags"
+ wmf_libs="-lwmf -lwmflite"
else
wmf_libs="-lwmflite"
fi
@@ -116,7 +116,7 @@
includes="$includes -I@includedir@/libwmf/gd"
fi
if test "$lib_wmf" = "yes"; then
- includes="$includes -I@includedir@"
+ includes="$includes"
fi
echo $includes
fi
@@ -134,5 +134,5 @@
fi
done
- echo $libdirs $my_wmf_libs
+ echo $my_wmf_libs
fi

View File

@ -1,7 +1,7 @@
Summary: Windows Metafile Library
Name: libwmf
Version: 0.2.8.4
Release: 4.2
Release: 5
Group: System Environment/Libraries
License: LGPL
Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
@ -9,6 +9,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
Patch0: libwmf-0.2.8.3-nodocs.patch
Patch1: libwmf-0.2.8.3-relocatablefonts.patch
Patch2: libwmf-0.2.8.4-fallbackfont.patch
Patch3: libwmf-0.2.8.4-deps.patch
Requires: gtk2 >= 2.4.1-2
Requires: libxml2 >= 2.6.8
Requires: gd >= 2.0.21
@ -42,6 +43,7 @@ Libraries, headers, and support files necessary to compile applications using li
%patch0 -p1 -b .nodocs
%patch1 -p1 -b .relocatablefonts
%patch2 -p1 -b .fallbackfont
%patch3 -p1 -b .deps
%build
rm configure.ac
@ -98,6 +100,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/loaders/*.la
rm -r $RPM_BUILD_ROOT
%changelog
* Tue Feb 28 2006 Caolan McNamara <caolanm@redhat.com> 0.2.8.4-5
- rh#143096# extra deps according to libwmf-config
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0.2.8.4-4.2
- bump again for double-long bug on ppc(64)