From 8a36e144a9eb2d99919122c107006b6beb8f8a4d3aafb7688fec64dc8bf132c8 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Wed, 20 Feb 2013 17:41:45 +0000
Subject: [PATCH] - use versioned /etc/ImageMagick* to allow parallel
 installation   of libMagickCore

OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=140
---
 ImageMagick-6.8.2.4-versioned-etc.patch | 13 +++++++++++++
 ImageMagick.changes                     |  6 ++++++
 ImageMagick.spec                        | 13 ++++++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 ImageMagick-6.8.2.4-versioned-etc.patch

diff --git a/ImageMagick-6.8.2.4-versioned-etc.patch b/ImageMagick-6.8.2.4-versioned-etc.patch
new file mode 100644
index 0000000..2fe3913
--- /dev/null
+++ b/ImageMagick-6.8.2.4-versioned-etc.patch
@@ -0,0 +1,13 @@
+Index: ImageMagick-6.8.2-4/configure.ac
+===================================================================
+--- ImageMagick-6.8.2-4.orig/configure.ac
++++ ImageMagick-6.8.2-4/configure.ac
+@@ -3045,7 +3045,7 @@ AC_DEFINE_UNQUOTED(DOCUMENTATION_PATH,"$
+ AC_SUBST(DOCUMENTATION_PATH)
+ 
+ # Subdirectory to place architecture-dependent configuration files
+-CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}"
++CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-Q${QUANTUM_DEPTH}-${MAGICK_LIBRARY_CURRENT}"
+ AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",[Subdirectory of lib where architecture-dependent configuration files live.])
+ CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
+ DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
diff --git a/ImageMagick.changes b/ImageMagick.changes
index 69cb591..1f19484 100644
--- a/ImageMagick.changes
+++ b/ImageMagick.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 20 17:37:59 UTC 2013 - pgajdos@suse.com
+
+- use versioned /etc/ImageMagick* to allow parallel installation
+  of libMagickCore
+
 -------------------------------------------------------------------
 Wed Feb  6 15:40:56 UTC 2013 - vjt@openssl.it
 
diff --git a/ImageMagick.spec b/ImageMagick.spec
index f12caa3..ecf9220 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -62,6 +62,7 @@ Patch1:         ImageMagick-6.6.8.9-examples.patch
 Patch2:         ImageMagick-6.6.8.9-doc.patch
 Patch3:         ImageMagick-6.7.6.1-no-dist-lzip.patch
 Patch4:         ImageMagick-6.8.2.4-revert-r9087-montage-signatures.patch
+Patch5:         ImageMagick-6.8.2.4-versioned-etc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package -n perl-PerlMagick
@@ -123,6 +124,7 @@ BuildArch:      noarch
 %patch2
 %patch3 -p1
 %patch4 -p4 -R
+%patch5 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -171,7 +173,6 @@ cd '../Magick++'
   PATH='/bin:/usr/bin' find demo -type f -perm +111 -execdir %{__rm} -rf '{}' ';'
   %{__mv} demo/makefile.2 demo/Makefile
 cd ..
-
 %{__mv} -t "${RPM_BUILD_ROOT}"'%{_sysconfdir}'/%{name}* "${RPM_BUILD_ROOT}"'%{_datadir}'/%{name}*/*.xml  
 PATH='/bin:/usr/bin' find "${RPM_BUILD_ROOT}/%{_libdir}" -name "*.la" ! -empty \
  -execdir %{__sed} -i -e 's@ -L/usr/src[^ ]*@@g' -e 's@ /usr/lib/libltdl.la@@g' '{}' ';'
@@ -387,4 +388,14 @@ support multiple generations of an image in memory at one time.
 HTML documentation for ImageMagick library and scene examples.
 
 
+
+
+
+
+
+
+
+
+
+
 %changelog