From fd096e30fcc1258e6c2bb2603596a574529f77e3c9dd6f06b51f9db37a37f5c4 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 24 Feb 2023 11:31:44 +0000 Subject: [PATCH] - add %bcond_without djvulibre OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=635 --- ImageMagick.changes | 5 +++++ ImageMagick.spec | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/ImageMagick.changes b/ImageMagick.changes index d1221e7..cea4b22 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 24 11:30:44 UTC 2023 - pgajdos@suse.com + +- add %bcond_without djvulibre + ------------------------------------------------------------------- Tue Feb 7 12:49:34 UTC 2023 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index ce1ceda..61df523 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -32,6 +32,9 @@ # bsc#1088463 %define urw_base35_fonts 0 +# do/don't pull djvulibre dependency +%bcond_without djvulibre + Name: ImageMagick Version: %{mfr_version}.%{mfr_revision} Release: 0 @@ -124,7 +127,9 @@ BuildRequires: ghostscript-fonts-other BuildRequires: ghostscript-fonts-std BuildRequires: ghostscript-library BuildRequires: libbz2-devel +%if %{with djvulibre} BuildRequires: libdjvulibre-devel +%endif BuildRequires: libexif-devel BuildRequires: libheif-devel BuildRequires: librsvg-devel @@ -379,7 +384,9 @@ export CXXFLAGS="%{optflags} -O0" --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='gcc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ --disable-static \ --with-gvc \ +%if %{with djvulibre} --with-djvu \ +%endif --with-fftw \ --with-lcms \ --with-jbig \ @@ -531,7 +538,9 @@ fi %if 0%{?suse_version} > 1315 %exclude %{_libdir}/ImageMagick*/modules*/*/jp2.* %endif +%if %{with djvulibre} %exclude %{_libdir}/ImageMagick*/modules*/*/djvu.* +%endif %{_libdir}/ImageMagick*/modules*/*/*.so # don't remove la files, see bnc#579798 %{_libdir}/ImageMagick*/modules*/*/*.la @@ -549,9 +558,11 @@ fi %{_libdir}/ImageMagick*/modules*/*/jp2.so %{_libdir}/ImageMagick*/modules*/*/jp2.la %endif +%if %{with djvulibre} %{_libdir}/ImageMagick*/modules*/*/djvu.so %{_libdir}/ImageMagick*/modules*/*/djvu.la %endif +%endif %files devel %{_libdir}/libMagickCore*.so