From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 13 Mar 2017 19:30:21 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.5-3~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b5a96063ca5e45aff5b4f8c88b2217c0a88fa84;p=imagemagick

...
---

diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in
index de9d1b15c..00abd47e2 100644
--- a/ImageMagick.spec.in
+++ b/ImageMagick.spec.in
@@ -11,13 +11,14 @@ License:        https://www.imagemagick.org/script/license.php
 Url:            https://www.imagemagick.org/
 Source0:        https://www.imagemagick.org/download/%{name}/%{name}-%{VERSION}-%{Patchlevel}.tar.bz2
 
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
 BuildRequires:  libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1
+BuildRequires:  perl-generators
 BuildRequires:  ghostscript-devel, djvulibre-devel
-BuildRequires:  libwmf-devel, jasper-devel, libtool-ltdl-devel
+BuildRequires:  libwmf-devel
 BuildRequires:  libX11-devel, libXext-devel, libXt-devel
 BuildRequires:  lcms2-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel
 BuildRequires:  fftw-devel, OpenEXR-devel, libwebp-devel
@@ -40,11 +41,11 @@ The authoritative ImageMagick web site is https://www.imagemagick.org. The autho
 %package devel
 Summary: Library links and header files for ImageMagick application development
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: libX11-devel, libXext-devel, libXt-devel, ghostscript-devel
 Requires: bzip2-devel, freetype-devel, libtiff-devel, libjpeg-devel, lcms2-devel
-Requires: libwebp-devel, OpenEXR-devel, jasper-devel, pkgconfig
-Requires: %{name}-libs = %{version}-%{release}
+Requires: libwebp-devel, OpenEXR-devel, openjpeg2-devel, pkgconfig
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description devel
 ImageMagick-devel contains the library links and header files you'll
@@ -66,7 +67,7 @@ This packages contains a shared libraries to use within other applications.
 %package djvu
 Summary: DjVu plugin for ImageMagick
 Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description djvu
 This packages contains a plugin for ImageMagick which makes it possible to
@@ -87,7 +88,7 @@ https://www.imagemagick.org/.
 %package perl
 Summary: ImageMagick perl bindings
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 
@@ -101,7 +102,7 @@ ImageMagick.
 %package c++
 Summary: ImageMagick Magick++ library (C++ bindings)
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description c++
 This package contains the Magick++ library, a C++ binding to the ImageMagick
@@ -113,8 +114,8 @@ Install ImageMagick-c++ if you want to use any applications that use Magick++.
 %package c++-devel
 Summary: C++ bindings for the ImageMagick library
 Group: Development/Libraries
-Requires: %{name}-c++ = %{version}-%{release}
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-c++%{?_isa} = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 
 %description c++-devel
 ImageMagick-devel contains the static libraries and header files you'll
@@ -241,7 +242,8 @@ make %{?_smp_mflags} check
 %{_libdir}/%{name}-%{VERSION}
 %{_datadir}/%{name}-7
 %exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16HDRI/coders/djvu.*
-%{_sysconfdir}/%{name}-7
+%dir %{_sysconfdir}/%{name}-7
+%config(noreplace) %{_sysconfdir}/%{name}-7/*.xml
 
 %files devel
 %{_bindir}/MagickCore-config