From 685b11c0568b40f4bdd9a30d9a9c0f5644c186b424757f64afba379f45507630 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 3 Jun 2013 15:43:22 +0000 Subject: [PATCH] - mark no-XPMCompliance.patch as suse specific http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23462 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=155 --- ImageMagick.changes | 6 ++++++ ImageMagick.spec | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index 21a09ff..3510457 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 3 15:37:32 UTC 2013 - pgajdos@suse.com + +- mark no-XPMCompliance.patch as suse specific + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23462 + ------------------------------------------------------------------- Thu May 23 09:55:52 UTC 2013 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 1e16d33..32e5b8b 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -63,11 +63,12 @@ Patch0: ImageMagick-6.6.8.9-examples.patch Patch1: ImageMagick-6.6.8.9-doc.patch Patch2: ImageMagick-6.7.6.1-no-dist-lzip.patch Patch3: ImageMagick-6.8.4.0-rpath.patch +# workaround for http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23462 +# upstream insists on XPMCompliance, so leaving this for compatibility reasons +Patch4: ImageMagick-6.8.5.7-no-XPMCompliance.patch # bugs # will ask upstream if needed, or if other solution exists Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch -# workaround for http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23462 -Patch12: ImageMagick-6.8.5.7-no-XPMCompliance.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick @@ -129,8 +130,8 @@ BuildArch: noarch %patch1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch11 -p1 -%patch12 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -397,4 +398,6 @@ HTML documentation for ImageMagick library and scene examples. + + %changelog