From 26cda3ee3da86f52f9af285ce639348442aadcda222580f87d4695980094b157 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 18 Oct 2011 14:31:28 +0000 Subject: [PATCH 1/2] - build against librsvg OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=102 --- ImageMagick.changes | 5 +++++ ImageMagick.spec | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/ImageMagick.changes b/ImageMagick.changes index 04ef918..877c910 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 18 14:23:33 UTC 2011 - pgajdos@suse.com + +- build against librsvg + ------------------------------------------------------------------- Sat Oct 15 04:47:13 UTC 2011 - coolo@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index d2fd705..5b1b7cb 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -83,6 +83,8 @@ BuildRequires: libjasper-devel BuildRequires: libwebp-devel %endif +BuildRequires: librsvg-devel + %define xtp_version 5.4.3 %define mfr_version 6.7.2 %define mfr_revision 7 @@ -239,6 +241,7 @@ popd --with-threads \ --without-perl \ --disable-static \ + --with-rsvg=yes \ --with-djvu=yes $OPENMP CFLAGS="%{CFLAGS}" CXXFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" make %{?_smp_mflags} all cd PerlMagick @@ -518,5 +521,9 @@ HTML documentation for ImageMagick library and scene examples. + + + + %changelog From b6dfe3b644760752b075918ce84d3ad119343438d75966eee981b53ba8c6a322 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 19 Oct 2011 05:49:59 +0000 Subject: [PATCH 2/2] - build against librsvg as recommended upstream [bnc#724222] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=103 --- ImageMagick.changes | 2 +- ImageMagick.spec | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index 877c910..5a6fbe2 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Oct 18 14:23:33 UTC 2011 - pgajdos@suse.com -- build against librsvg +- build against librsvg as recommended upstream [bnc#724222] ------------------------------------------------------------------- Sat Oct 15 04:47:13 UTC 2011 - coolo@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 5b1b7cb..dd9dff2 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -29,6 +29,8 @@ %bcond_without EXIF %bcond_without JPEG %bcond_without WEBP +# build against librsvg [bnc#724222] +%bcond_without RSVG Name: ImageMagick @@ -83,7 +85,9 @@ BuildRequires: libjasper-devel BuildRequires: libwebp-devel %endif +%if %{with RSVG} BuildRequires: librsvg-devel +%endif %define xtp_version 5.4.3 %define mfr_version 6.7.2 @@ -147,6 +151,9 @@ Requires: libjasper-devel %if %{with WEBP} Requires: libwebp-devel %endif +%if %{with RSVG} +Requires: librsvg-devel +%endif %package extra License: PERMISSIVE-OSI-COMPLIANT @@ -241,7 +248,6 @@ popd --with-threads \ --without-perl \ --disable-static \ - --with-rsvg=yes \ --with-djvu=yes $OPENMP CFLAGS="%{CFLAGS}" CXXFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" make %{?_smp_mflags} all cd PerlMagick @@ -515,6 +521,16 @@ HTML documentation for ImageMagick library and scene examples. + + + + + + + + + +