From 3b0f774dd7042f5c9d8f91df8794ffa027742f9c Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Tue, 28 Feb 2006 11:13:42 +0000 Subject: [PATCH] rh#143096# extra deps according to libwmf-devel --- libwmf-0.2.8.4-deps.patch | 27 +++++++++++++++++++++++++++ libwmf.spec | 7 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 libwmf-0.2.8.4-deps.patch diff --git a/libwmf-0.2.8.4-deps.patch b/libwmf-0.2.8.4-deps.patch new file mode 100644 index 0000000..ee38ecb --- /dev/null +++ b/libwmf-0.2.8.4-deps.patch @@ -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 diff --git a/libwmf.spec b/libwmf.spec index 210c8a7..68af5b7 100644 --- a/libwmf.spec +++ b/libwmf.spec @@ -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 0.2.8.4-5 +- rh#143096# extra deps according to libwmf-config + * Fri Feb 10 2006 Jesse Keating - 0.2.8.4-4.2 - bump again for double-long bug on ppc(64)