From a42c5f3a3bbd9078dab9e1cfd78966ad58ca5691251bececb23f53a1200039a6 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 5 Dec 2008 14:30:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=19 --- ImageMagick-6.4.3.6-pkgconfig.patch | 10 ++++++++++ ImageMagick.changes | 5 +++++ ImageMagick.spec | 8 ++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ImageMagick-6.4.3.6-pkgconfig.patch diff --git a/ImageMagick-6.4.3.6-pkgconfig.patch b/ImageMagick-6.4.3.6-pkgconfig.patch new file mode 100644 index 0000000..a3fdba9 --- /dev/null +++ b/ImageMagick-6.4.3.6-pkgconfig.patch @@ -0,0 +1,10 @@ +--- configure.ac ++++ configure.ac +@@ -205,6 +205,7 @@ + AC_COMPILE_WARNINGS + AC_PROG_LN_S + AM_WITH_DMALLOC ++PKG_PROG_PKG_CONFIG + + # + # Enable OS features. diff --git a/ImageMagick.changes b/ImageMagick.changes index 52d0134..48e53a5 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 5 11:21:47 CET 2008 - nadvornik@suse.cz + +- fixed fontconfig detection [bnc#441874] + ------------------------------------------------------------------- Mon Dec 1 12:43:56 CET 2008 - ro@suse.de diff --git a/ImageMagick.spec b/ImageMagick.spec index dd5f6d8..326beb4 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -36,13 +36,14 @@ License: Any permissive Group: Productivity/Graphics/Other AutoReqProv: on Version: 6.4.3.6 -Release: 5 +Release: 6 Summary: Viewer and Converter for Images Url: http://www.imagemagick.org Source: ImageMagick-6.4.3-6.tar.bz2 Source2: xtp-%{xtp_version}.tar.bz2 Patch1: ImageMagick-%{version}-examples.patch Patch2: ImageMagick-%{version}-doc.patch +Patch3: ImageMagick-%{version}-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick @@ -105,6 +106,7 @@ rm -rf xtp-%{xtp_version} %setup -n ImageMagick-6.4.3 -b 2 %patch1 %patch2 +%patch3 %build %define system_ltdl 0 @@ -113,7 +115,7 @@ cp -f /usr/share/libtool/libltdl/*.{c,h} ltdl mv ltdl/ltdl.c ltdl/ltdl.c.orig sed -e "s:::" ltdl/ltdl.c.orig >ltdl/ltdl.c %endif -#autoreconf --force --install -v +autoreconf --force --install -v pushd ../xtp-%{xtp_version} autoreconf --force --install popd @@ -405,6 +407,8 @@ Authors: Bob Friesenhahn %changelog +* Fri Dec 05 2008 nadvornik@suse.cz +- fixed fontconfig detection [bnc#441874] * Mon Dec 01 2008 ro@suse.de - add libMagicWand1 to baselibs.conf (for libxine1) * Tue Oct 07 2008 thoenig@suse.de