From d0fc79a2a435aa29e599019fe298ace880e01bd9f5d823838a366667d9d9337c Mon Sep 17 00:00:00 2001 From: Factory Maintainer Date: Sun, 7 Apr 2013 12:18:55 +0000 Subject: [PATCH] Accepting request 163063 from home:coolo:branches:openSUSE:Factory - add ImageMagick-6.8.4.0-fix-wand.pc.patch to fix build of e.g. emacs and xine-lib, who rely on pkg-config --libs Wand returning actually MagickWand and not MagickCore (looks like a copy&paste error of upstream) OBS-URL: https://build.opensuse.org/request/show/163063 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=148 --- ImageMagick-6.8.4.0-fix-wand.pc.patch | 17 ++++++++++++++ ImageMagick.changes | 8 +++++++ ImageMagick.spec | 33 +++------------------------ 3 files changed, 28 insertions(+), 30 deletions(-) create mode 100644 ImageMagick-6.8.4.0-fix-wand.pc.patch diff --git a/ImageMagick-6.8.4.0-fix-wand.pc.patch b/ImageMagick-6.8.4.0-fix-wand.pc.patch new file mode 100644 index 0000000..8cd59cb --- /dev/null +++ b/ImageMagick-6.8.4.0-fix-wand.pc.patch @@ -0,0 +1,17 @@ +Index: ImageMagick-6.8.4-0/wand/Wand.pc.in +=================================================================== +--- ImageMagick-6.8.4-0.orig/wand/Wand.pc.in ++++ ImageMagick-6.8.4-0/wand/Wand.pc.in +@@ -2,10 +2,10 @@ prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ +-libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ ++libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ + + Name: MagickWand +-Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) ++Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) + Version: @PACKAGE_VERSION@ + Requires: MagickCore + Libs: -L${libdir} -l${libname} diff --git a/ImageMagick.changes b/ImageMagick.changes index 5b8efaa..d38c10a 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Apr 7 12:00:44 UTC 2013 - coolo@suse.com + +- add ImageMagick-6.8.4.0-fix-wand.pc.patch to fix build of e.g. + emacs and xine-lib, who rely on pkg-config --libs Wand returning + actually MagickWand and not MagickCore (looks like a copy&paste + error of upstream) + ------------------------------------------------------------------- Fri Mar 29 09:37:28 UTC 2013 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 2cc333a..62ca7ad 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -68,6 +68,8 @@ Patch3: ImageMagick-6.8.4.0-rpath.patch Patch10: ImageMagick-6.8.4.0-test-signatures.patch # will ask upstream if needed, or if other solution exists Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch +# PATCH-FIX-UPSTREAM ImageMagick-6.8.4.0-fix-wand.pc.patch fix e.g. emacs build, pkg-config --libs Wand returns wrong lib +Patch12: ImageMagick-6.8.4.0-fix-wand.pc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick @@ -131,6 +133,7 @@ BuildArch: noarch %patch3 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -390,34 +393,4 @@ support multiple generations of an image in memory at one time. HTML documentation for ImageMagick library and scene examples. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %changelog