From 57ffa65c5b0037d55da9c31155fe24dec5b197fd121b9f46a934b203d3db5941 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 27 May 2014 14:02:17 +0000 Subject: [PATCH] Accepting request 235274 from home:Mailaender:branches:graphics to fix the SLE build properly you will need the project config from my branch, too OBS-URL: https://build.opensuse.org/request/show/235274 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=202 --- ImageMagick.changes | 16 ++++++++++++++++ ImageMagick.spec | 29 +++++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index b45a8a3..f329e62 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sat May 24 11:07:38 UTC 2014 - mailaender@opensuse.org + +- Fixed the SLE build +- Added missing dependencies: + * autotrace + * dejavu-fonts + * fftw3 + * ghostscript + * libjbig + * liblqr + * mupdf + * p7zip + * xdg-utils + * zip + ------------------------------------------------------------------- Thu Apr 24 09:54:12 UTC 2014 - dmueller@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index b8ab625..f1e6aa0 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -18,20 +18,27 @@ Name: ImageMagick +BuildRequires: autotrace-devel BuildRequires: autoconf >= 2.69 BuildRequires: dcraw +%if 0%{?suse_version} >= 1140 +BuildRequires: dejavu-fonts +%endif BuildRequires: fdupes +BuildRequires: fftw3-devel BuildRequires: freetype2-devel BuildRequires: gcc-c++ -BuildRequires: ghostscript-fonts-other -BuildRequires: ghostscript-fonts-std -BuildRequires: ghostscript-library +BuildRequires: ghostscript-devel BuildRequires: libbz2-devel BuildRequires: libdjvulibre-devel BuildRequires: libexif-devel BuildRequires: libjasper-devel +BuildRequires: libjbig-devel BuildRequires: libjpeg-devel BuildRequires: liblcms2-devel +%if 0%{?suse_version} >= 1140 +BuildRequires: liblqr-devel +%endif BuildRequires: librsvg-devel BuildRequires: libtiff-devel >= 4.0.3 BuildRequires: libtool @@ -39,10 +46,19 @@ BuildRequires: libwebp-devel BuildRequires: libwmf-devel BuildRequires: libxml2-devel BuildRequires: lzma-devel +%if 0%{?suse_version} >= 1140 +BuildRequires: mupdf-devel-static BuildRequires: openexr-devel +%endif BuildRequires: openjpeg2-devel +%if 0%{?suse_version} >= 1140 +BuildRequires: p7zip +%endif BuildRequires: pango-devel BuildRequires: pkgconfig +BuildRequires: xdg-utils +BuildRequires: xz +BuildRequires: zip %define maj 6 %define mfr_version %{maj}.8.8 @@ -227,7 +243,7 @@ support multiple generations of an image in memory at one time. HTML documentation for ImageMagick library and scene examples. %prep -%setup -n ImageMagick-%{source_version} +%setup -q -n ImageMagick-%{source_version} %patch0 %patch1 %patch2 -p1 @@ -267,6 +283,7 @@ automake make %{?_smp_mflags} all make -j1 perl-build +%if 0%{?suse_version} >= 1140 %check export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs @@ -274,6 +291,7 @@ export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs export MAGICK_CONFIGURE_PATH=$PWD/config cd PerlMagick make test +%endif %install %{__make} install \ @@ -372,6 +390,9 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ %doc %{_mandir}/man3/* %{perl_vendorarch}/auto/Image %{perl_vendorarch}/Image +%if 0%{?suse_version} < 1140 +/var/adm/perl-modules/ImageMagick +%endif %files -n libMagick++%{libspec}-%{cxxlibver} %defattr(-,root,root)