From d69c7f6104655e556a9c3eadfda6223b92bb5b946c50a6f8b0ccfd08326e823b Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 3 Mar 2014 13:48:05 +0000 Subject: [PATCH] - directories in libMagickCore depends on %{clibver} and %{quantum_depth} [bnc#866442] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=198 --- ImageMagick.changes | 6 ++++++ ImageMagick.spec | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index f032977..f57d7f5 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 3 13:34:39 UTC 2014 - pgajdos@suse.com + +- directories in libMagickCore depends on %{clibver} and + %{quantum_depth} [bnc#866442] + ------------------------------------------------------------------- Thu Feb 27 08:25:02 UTC 2014 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index d6c111d..c329749 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -47,13 +47,14 @@ BuildRequires: openjpeg2-devel BuildRequires: pango-devel BuildRequires: pkgconfig -%define mfr_version 6.8.8 +%define maj 6 +%define mfr_version %{maj}.8.8 %define mfr_revision 7 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 2 %define cxxlibver 3 -%define libspec -6_Q%{quantum_depth} +%define libspec -%{maj}_Q%{quantum_depth} Version: %{mfr_version}.%{mfr_revision} Release: 0 Summary: Viewer and Converter for Images @@ -242,6 +243,12 @@ HTML documentation for ImageMagick library and scene examples. export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" export LDFLAGS="-L%{_libdir}" +# for MODULES_DIRNAME setup purpose see bnc#866442 +export MODULES_DIRNAME="modules-%{maj}_Q%{quantum_depth}-%{clibver}" +# for SHAREARCH_DIRNAME setup purpose see bnc#866442 +export SHAREARCH_DIRNAME="config-%{maj}_Q%{quantum_depth}-%{clibver}" +# for CONFIGURE_RELATIVE_PATH setup purpose see bnc#866442 +sed -i 's:^\(CONFIGURE_RELATIVE_PATH=.*\):\1_Q%{quantum_depth}-%{clibver}:' configure.ac CHANGES=`stat --format="%y" %SOURCE1|cut --characters=1-10` # Use mtime of .changes for build time sed -i -e "s|^PACKAGE_RELEASE_DATE.*$|PACKAGE_RELEASE_DATE=\"$CHANGES\"|" version.sh