Prefer pkg-config for locating required libraries

1 files changed, 30 insertions, 11 deletions

diff --git a/ImageMagick6.spec b/ImageMagick6.spec
index 2cfea42..66db5da 100644
--- a/ImageMagick6.spec
+++ b/ImageMagick6.spec
@@ -82,35 +82,53 @@ Source0:        ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{P
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:  bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
-BuildRequires:  libtiff-devel, giflib-devel, zlib-devel
+# TODO: Could use pkgconfig(bzip2) for Fedora >= 27
+BuildRequires:  bzip2-devel
+BuildRequires:  pkgconfig(freetype2)
+# TODO: Needs libjpeg-turbo-devel for RHEL 6
+BuildRequires:	pkgconfig(libjpeg)
+BuildRequires:	pkgconfig(libpng)
+# TODO: Needs libtiff-devel for RHEL 6
+BuildRequires:  pkgconfig(libtiff-4)
+BuildRequires:	giflib-devel
+BuildRequires:	pkgconfig(zlib)
 BuildRequires:  perl-devel
 BuildRequires:  perl-generators
 BuildRequires:  ghostscript-devel
 %if %{with_djvu}
+# TODO: Could use pkgconfig(ddjvuapi) for Fedora >= 27
 BuildRequires:  djvulibre-devel
 %endif
-BuildRequires:  libwmf-devel, jasper-devel, libtool-ltdl-devel
-BuildRequires:  libX11-devel, libXext-devel, libXt-devel
-BuildRequires:  libxml2-devel, librsvg2-devel
-BuildRequires:  fftw-devel
-BuildRequires:  OpenEXR-devel
-BuildRequires:  lcms2-devel
+BuildRequires:  libwmf-devel
+BuildRequires:  pkgconfig(jasper)
+BuildRequires:  libtool-ltdl-devel
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xt)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(librsvg-2.0)
+BuildRequires:  pkgconfig(fftw3)
+BuildRequires:  pkgconfig(OpenEXR)
+# TODO: Needs lcms2-devel for RHEL 6
+BuildRequires:  pkgconfig(lcms2)
 %if %{with_raw}
-BuildRequires:  LibRaw-devel >= 0.14.8
+# TODO: Needs LibRaw-devel for RHEL 6
+BuildRequires:  pkgconfig(libraw) >= 0.14.8
 %endif
 %if %{with_webp}
-BuildRequires:  libwebp-devel
+# TODO: Needs libwebp-devel for RHEL 6
+BuildRequires:  pkgconfig(libwebp)
 %endif
 %if %{with_jbig}
 BuildRequires:  jbigkit-devel
 %endif
 %if %{with_jp2}
 %if 0%{?rhel} == 7
-# See https://github.com/jcupitt/libvips/issues/764
+# See https://github.com/libvips/libvips/issues/764
 # vips pulls poppler (libopenjpeg) and IM (libopenjp2)
 BuildRequires:  openjpeg2-static-devel
 %else
+# TODO: Could use pkgconfig(libopenjp2) for Fedora >= 27
 BuildRequires:  openjpeg2-devel >= 2.1.0
 %endif
 %endif
@@ -118,6 +136,7 @@ BuildRequires:  openjpeg2-devel >= 2.1.0
 BuildRequires:  graphviz-devel >= 2.9.0
 %endif
 %if %{with_raqm}
+# TODO: Could use pkgconfig(raqm) for Fedora >= 27
 BuildRequires:  libraqm-devel
 %endif
 %if %{with_lqr}