pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- another attempt to make a libMagickCore* version installable with

Browse Source 
another version [bsc#1054659]

OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=295
This commit is contained in:
Petr Gajdos 2017-08-28 15:08:56 +00:00 committed by Git OBS Bridge
parent e8a630b37d
commit 38cfeb32c0
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ImageMagick-library-installable-in-parallel.patch Normal file
View File

@ -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"

6
ImageMagick.changes
View File

@ -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

8
ImageMagick.spec
View File

@ -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}