From 38cfeb32c019c6f2b7367d170fd3ad5ccfdbd44830ae62a9ccca577c9cfd0dd1 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Mon, 28 Aug 2017 15:08:56 +0000
Subject: [PATCH] - another attempt to make a libMagickCore* version
 installable with   another version [bsc#1054659]

OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=295
---
 ImageMagick-library-installable-in-parallel.patch | 15 +++++++++++++++
 ImageMagick.changes                               |  6 ++++++
 ImageMagick.spec                                  |  8 +++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 ImageMagick-library-installable-in-parallel.patch

diff --git a/ImageMagick-library-installable-in-parallel.patch b/ImageMagick-library-installable-in-parallel.patch
new file mode 100644
index 0000000..41a5cc4
--- /dev/null
+++ b/ImageMagick-library-installable-in-parallel.patch
@@ -0,0 +1,15 @@
+Index: ImageMagick-7.0.6-7/configure
+===================================================================
+--- ImageMagick-7.0.6-7.orig/configure	2017-08-12 15:28:32.000000000 +0200
++++ ImageMagick-7.0.6-7/configure	2017-08-28 16:56:48.177815147 +0200
+@@ -34903,7 +34903,9 @@ fi
+ 
+ 
+ # Subdirectory to place architecture-dependent configuration files
+-CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
++if test "x$CONFIGURE_RELATIVE_PATH" = "x"; then
++   CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
++fi
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH"
diff --git a/ImageMagick.changes b/ImageMagick.changes
index 754226b..916b6b1 100644
--- a/ImageMagick.changes
+++ b/ImageMagick.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 28 15:06:48 UTC 2017 - pgajdos@suse.com
+
+- another attempt to make a libMagickCore* version installable with
+  another version [bsc#1054659]
+
 -------------------------------------------------------------------
 Mon Aug 14 10:41:56 UTC 2017 - pgajdos@suse.com
 
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 8a95f64..df0982f 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -76,6 +76,7 @@ Source3:        ImageMagick.keyring
 Patch0:         ImageMagick-disable-insecure-coders.patch
 # workaround, see https://github.com/ImageMagick/ImageMagick/issues/439
 Patch1:         ImageMagick-relax-filter.t.patch
+Patch2:         ImageMagick-library-installable-in-parallel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package -n perl-PerlMagick
@@ -229,8 +230,13 @@ HTML documentation for ImageMagick library and scene examples.
 %setup -q -n ImageMagick-%{source_version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
+# make library binary package parallel installable
+export MODULES_DIRNAME="modules%{libspec}%{clibver}"
+export SHAREARCH_DIRNAME="config%{libspec}%{clibver}"
+export CONFIGURE_RELATIVE_PATH="ImageMagick%{libspec}%{clibver}"
 %configure \
   --with-pic \
   --enable-shared \
@@ -299,7 +305,7 @@ chmod 755 $perl_module
 chrpath -d $perl_module
 chmod 555 $perl_module
 # remove %%{buildroot} from distributed file
-sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/config-Q16HDRI/configure.xml
+sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/config%{libspec}%{clibver}/configure.xml
 #remove duplicates
 %fdupes -s %{buildroot}%{_defaultdocdir}/%{name}-%{maj}
 %fdupes -s %{buildroot}%{_includedir}/%{name}-%{maj}