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

Accepting request 483272 from graphics

Browse Source 
- updated to 7.0.5-4
  * new branch, see
    https://www.imagemagick.org/script/porting.php
- deleted unneded patches
  . ImageMagick-6.6.8.9-doc.patch
  . ImageMagick-6.6.8.9-examples.patch
  . ImageMagick-6.7.6.1-no-dist-lzip.patch
  . ImageMagick-6.8.4.0-dont-build-in-install.patch
  . ImageMagick-6.8.4.0-rpath.patch
  . ImageMagick-montage.t.patch
  . ImageMagick-6.8.5.7-no-XPMCompliance.patch
- renamed patches
  . ImageMagick-6.8.8-1-disable-insecure-coders.patch to
    ImageMagick-disable-insecure-coders.patch

OBS-URL: https://build.opensuse.org/request/show/483272
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=137
This commit is contained in:
Yuchen Lin 2017-04-06 08:59:42 +00:00 committed by Git OBS Bridge
commit c6b0ba5a03
15 changed files with 123 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ImageMagick-6.6.8.9-doc.patch
View File

@ -1,13 +0,0 @@
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -2941,7 +2941,7 @@ AC_SUBST(FILTER_PATH)
#
# Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
+DOCUMENTATION_RELATIVE_PATH="packages/${PACKAGE_NAME}"
DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
case "${build_os}" in

13
ImageMagick-6.6.8.9-examples.patch
View File

@ -1,13 +0,0 @@
Index: Magick++/demo/makefile.2
===================================================================
--- /dev/null
+++ Magick++/demo/makefile.2
@@ -0,0 +1,8 @@
+LDFLAGS= $(shell Magick-config --ldflags)
+LOADLIBES=-lMagick++ $(shell Magick-config --libs)
+CPPFLAGS=$(shell Magick-config --cflags) $(shell Magick-config --cppflags)
+
+all: button demo detrans flip shapes
+
+
+

13
ImageMagick-6.7.6.1-no-dist-lzip.patch
View File

@ -1,13 +0,0 @@
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -49,7 +49,7 @@ AC_CONFIG_HEADERS([config/config.h])
AX_PREFIX_CONFIG_H([magick/magick-baseconfig.h],[MagickCore])
AC_CANONICAL_SYSTEM
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([foreign color-tests -Wall -Wno-portability subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip tar-ustar])
+AM_INIT_AUTOMAKE([foreign color-tests -Wall -Wno-portability subdir-objects dist-bzip2 dist-xz dist-zip tar-ustar])
AM_SILENT_RULES([yes])
#

17
ImageMagick-6.8.4.0-dont-build-in-install.patch
View File

@ -1,17 +0,0 @@
perl Makefile.PL always regenerates Makefile
Index: PerlMagick/Makefile.am
===================================================================
--- PerlMagick/Makefile.am.orig
+++ PerlMagick/Makefile.am
@@ -57,9 +57,8 @@ PERLMAGICK_CHECKSCRPTS =
$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-install-exec-perl: $(PERLMAKEFILE)
- ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
- $(MAKE) CC='@CC@' install )
+install-exec-perl:
+ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install )
all-perl: perl-sources

13
ImageMagick-6.8.4.0-rpath.patch
View File

@ -1,13 +0,0 @@
Index: PerlMagick/Makefile.am
===================================================================
--- PerlMagick/Makefile.am.orig
+++ PerlMagick/Makefile.am
@@ -70,7 +70,7 @@ check-perl: $(PERLMAKEFILE)
cd $(PERLMAGICK) && $(abs_top_builddir)/magick.sh $(MAKE) CC='@CC@' test
perl-build: $(PERLMAKEFILE)
- ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' )
+ ( cd $(PERLMAGICK) && sed -i 's:LD_RUN_PATH:DIE_RPATH_DIE:' Makefile quantum/Makefile && $(MAKE) CC='@CC@' )
else
if WITH_PERL_STATIC

13
ImageMagick-6.8.5.7-no-XPMCompliance.patch
View File

@ -1,13 +0,0 @@
Index: coders/xpm.c
===================================================================
--- coders/xpm.c.orig
+++ coders/xpm.c
@@ -415,7 +415,7 @@ static Image *ReadXPMImage(const ImageIn
image->storage_class=DirectClass;
image->matte=MagickTrue;
}
- status=QueryColorCompliance(target,XPMCompliance,&image->colormap[j],
+ status=QueryColorCompliance(target,AllCompliance,&image->colormap[j],
exception);
if (status == MagickFalse)
break;

3
ImageMagick-6.9.8-2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be809993975dbc84b69987a8b914b656849351396c519b54199083967fceb143
size 9041700

16
ImageMagick-6.9.8-2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJYzwUmAAoJEImrY9SCdzd6zfsQALCX7jCrEE64DlFshM5+y1gc
zZwPOZNnUy5c3dt7ERfiWLy6XeZE0TgLPYcC3/Lw/ZRusG1FpVEquCjI/GvcuXug
vOJzZ0gP3tBKrisQxfn1D6/VY94Rki8OIS56vGAtGInFkBpaoEdc4b98xHHeyrNk
fY/mhvmAKimTmLu9upkPbDDRT7MecJsJHZMfmrwijq7EZdGcBfjAPGb7rmwdhNff
T2wk4ukEuVRnR3v4jzjrhvLqOfCttLOngBQa21rA2ZUM8pjeBc55emdhaDJvEitG
vATRhsFTBTczWk4rEIW0McuF+R8pWq4Br5IiXZKq3HdJSPP0A8crqCuvBzYCjlML
TXwgUa9RVwVDSoSrbPoPqne21up57YqBUZ/ZFYq2i5F451+b8ikwwnkudIahgloR
9uqXUsdHN06VL8MJFKMjJETHQhaoa3J3gDE8nWNRSSuWGUtTTDNuPy8P7bVsG7AH
Xwoup7NLd/MO5qHHXG87RMZ3YughRywnsUnFpgE7L6lk/qwlUasiY8x2OKWiCfNq
cs8dILjR6CTRULXF+dGg+LX2PrC3Yc9JqpXaD4kPQnydj/aJIw87QaSwFIDMmUtO
zl3QJ/+bUC7WQ5hKFp0LaC4HQepcpni/6Aebbf9ruCo9th7eZN4Y2KnFmRfe314A
IYZ3JDynDFUjPlACJ4HF
=kb7Q
-----END PGP SIGNATURE-----

3
ImageMagick-7.0.5-4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4a1dde5bdfec0fc549955a051be25b7ff96dfb192060997699e43c7ce0f06ab2
size 8316148

16
ImageMagick-7.0.5-4.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJY1mEPAAoJEImrY9SCdzd64G0P/1moh4xtl9UwUaNBNBFdoN17
MfUC6xB4yhJoQbPB99kQAWJ9cdeewTmRQjw14E92puzG6ywXtoY/YF+j4uQOA1pW
rHtqXtBgC7+a2K/+/DzHFLwXIh3oBAWxw7H60tatS7dtb4lpvGnXeQ7ZCN2tKJ+D
4B53VHvq4VU/NoOrxO36KnfdzmLypyf7qO9dnX9Gm9cURi1vOWEzJiu/0yJkSsk7
D639DbvuOUYwTxNyvB1H50D5B0f3/bqA+aumK/fw6FD4JKCyKDCtthzv+gGNH6NS
Vq5IR2QOdxRXLAjoUZZpvJOoMS6WNh3GLn4WE2FXm/r8NYa/8glrVIkWITcKz/8q
HA82++md/vVqsZnoODjRkg76LE4qw/A2QnPcJGN29p0HxvVMAE0wCAax7qUmZZbz
LoNwlaApzZT6HCtNNcsnJ3Ohyw7m0YL7xCp/a4vaN8TCh2Bna9RvsNxIBe6IwKq2
CHcC91pViTV8UIiigTPm3/CtMu41VQ+Yf8Cy2ULcfuQuyEJgwqRFoXTwvou9iRkw
y0fiLb9sKYnXR+QLP/pxxykd3WTQrnnw2i6Tgkka4XNmb63kYgbT/d7ehjmhLK4C
dqX6IlE7f/rFFa3S7JsFuJUHo2Qw2yxtb+y84rPeuVBlV1vXWW/RwFMpVhaB0iQZ
GPgiq8TLR6PJ7pFWJI2A
=hMwH
-----END PGP SIGNATURE-----

0
ImageMagick-6.8.8-1-disable-insecure-coders.patch → ImageMagick-disable-insecure-coders.patch
View File

25
ImageMagick-montage.t.patch
View File

@ -1,25 +0,0 @@
Revert this patch for 6.8.9-2
https://github.com/ImageMagick/ImageMagick/commit/56d460bf2bc74bed22bed8dfe1cb0479035a24f7
From 56d460bf2bc74bed22bed8dfe1cb0479035a24f7 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 16 Feb 2017 10:54:27 -0500
Subject: [PATCH] ...
---
PerlMagick/t/montage.t | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/PerlMagick/t/montage.t b/PerlMagick/t/montage.t
index 16f6e2d..b323bfe 100644
--- a/PerlMagick/t/montage.t
+++ b/PerlMagick/t/montage.t
@@ -165,7 +165,7 @@ testMontage( q/bordercolor=>'blue', mattecolor=>'red'/,
q/background=>'#696e7e',, tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
borderwidth=>'0', gravity=>'Center', shadow=>'True', texture=>'granite:'/,
'8418407b6d56d2c1b67bc735004794d9eb20609d30115a93255eefcad3499e95',
- '9209b2db884fa4730eeab6c410b90e094fa305635baab7ede17270c13f6e80ad',
+ '35864982c2d66e1f9f4ac8150a7f8bd0926d0d48a2b4602bb229f878bd4d8752',
'5793a1de15b5d73df297968af79fa01a110c1585cccd46dcbef794674ab5f174');
#

18
ImageMagick.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Wed Mar 22 11:26:21 UTC 2017 - pgajdos@suse.com
- updated to 7.0.5-4
* new branch, see
https://www.imagemagick.org/script/porting.php
- deleted unneded patches
. ImageMagick-6.6.8.9-doc.patch
. ImageMagick-6.6.8.9-examples.patch
. ImageMagick-6.7.6.1-no-dist-lzip.patch
. ImageMagick-6.8.4.0-dont-build-in-install.patch
. ImageMagick-6.8.4.0-rpath.patch
. ImageMagick-montage.t.patch
. ImageMagick-6.8.5.7-no-XPMCompliance.patch
- renamed patches
. ImageMagick-6.8.8-1-disable-insecure-coders.patch to
ImageMagick-disable-insecure-coders.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 20 14:21:31 UTC 2017 - pgajdos@suse.com Mon Mar 20 14:21:31 UTC 2017 - pgajdos@suse.com

203
ImageMagick.spec
View File

@ -19,10 +19,10 @@
Name: ImageMagick Name: ImageMagick
BuildRequires: autoconf >= 2.69 BuildRequires: autoconf >= 2.69
BuildRequires: chrpath
BuildRequires: dcraw BuildRequires: dcraw
%if 0%{?suse_version} >= 1140
BuildRequires: dejavu-fonts BuildRequires: dejavu-fonts
%endif BuildRequires: dos2unix
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: fftw3-devel BuildRequires: fftw3-devel
BuildRequires: freetype2-devel BuildRequires: freetype2-devel
@ -35,9 +35,7 @@ BuildRequires: libjasper-devel
BuildRequires: libjbig-devel BuildRequires: libjbig-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: liblcms2-devel BuildRequires: liblcms2-devel
%if 0%{?suse_version} >= 1140
BuildRequires: liblqr-devel BuildRequires: liblqr-devel
%endif
BuildRequires: librsvg-devel BuildRequires: librsvg-devel
BuildRequires: libtiff-devel >= 4.0.3 BuildRequires: libtiff-devel >= 4.0.3
BuildRequires: libtool BuildRequires: libtool
@ -45,71 +43,50 @@ BuildRequires: libwebp-devel
BuildRequires: libwmf-devel BuildRequires: libwmf-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: lzma-devel BuildRequires: lzma-devel
%if 0%{?suse_version} >= 1310
BuildRequires: mupdf-devel-static BuildRequires: mupdf-devel-static
%endif
%if 0%{?suse_version} >= 1140
BuildRequires: openexr-devel BuildRequires: openexr-devel
%endif
BuildRequires: openjpeg2-devel >= 2.1.0 BuildRequires: openjpeg2-devel >= 2.1.0
%if 0%{?suse_version} >= 1140
BuildRequires: p7zip BuildRequires: p7zip
%endif
BuildRequires: pango-devel BuildRequires: pango-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: xdg-utils BuildRequires: xdg-utils
BuildRequires: xz BuildRequires: xz
BuildRequires: zip BuildRequires: zip
%define maj 6 %define maj 7
%define mfr_version %{maj}.9.8 %define mfr_version %{maj}.0.5
%define mfr_revision 2 %define mfr_revision 4
%define quantum_depth 16 %define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision} %define source_version %{mfr_version}-%{mfr_revision}
%define clibver 4 %define clibver 2
%define cxxlibver 7 %define cwandver 0
%define libspec -%{maj}_Q%{quantum_depth} %define cxxlibver 2
%define libspec -%{maj}_Q%{quantum_depth}HDRI
Version: %{mfr_version}.%{mfr_revision} Version: %{mfr_version}.%{mfr_revision}
Release: 0 Release: 0
Summary: Viewer and Converter for Images Summary: Viewer and Converter for Images
License: ImageMagick License: ImageMagick
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
Url: http://www.imagemagick.org Url: http://www.imagemagick.org
Source: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz Source0: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz
# To get mtime of file Source1: baselibs.conf
Source1: ImageMagick.changes Source2: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz.asc
Source2: baselibs.conf Source3: ImageMagick.keyring
Source3: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz.asc
Source4: ImageMagick.keyring
# suse specific patches # suse specific patches
Patch0: ImageMagick-6.6.8.9-examples.patch Patch0: ImageMagick-disable-insecure-coders.patch
Patch1: ImageMagick-6.6.8.9-doc.patch
Patch2: ImageMagick-6.7.6.1-no-dist-lzip.patch
Patch3: ImageMagick-6.8.4.0-rpath.patch
# workaround for http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23462
# upstream insists on XPMCompliance, so leaving this for compatibility reasons
Patch4: ImageMagick-6.8.5.7-no-XPMCompliance.patch
# bugs
# will ask upstream if needed, or if other solution exists
Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch
# revert https://github.com/ImageMagick/ImageMagick/commit/56d460bf2bc74bed22bed8dfe1cb0479035a24f7
# as this does not fit to 6.9.8-2
# commented in the commit
Patch12: ImageMagick-montage.t.patch
Patch20: ImageMagick-6.8.8-1-disable-insecure-coders.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package -n perl-PerlMagick %package -n perl-PerlMagick
Requires: ImageMagick = %{version} Requires: ImageMagick = %{version}
Requires: libMagickCore%{libspec}-%{clibver} = %{version} Requires: libMagickCore%{libspec}%{clibver} = %{version}
Requires: perl = %{perl_version} Requires: perl = %{perl_version}
Summary: Perl interface for ImageMagick Summary: Perl interface for ImageMagick
Group: Development/Libraries/Perl Group: Development/Libraries/Perl
%package devel %package devel
Requires: ImageMagick = %{version} Requires: ImageMagick = %{version}
Requires: libMagickCore%{libspec}-%{clibver} = %{version} Requires: libMagickCore%{libspec}%{clibver} = %{version}
Requires: libMagickWand%{libspec}-%{clibver} = %{version} Requires: libMagickWand%{libspec}%{cwandver} = %{version}
Summary: Include Files and Libraries Mandatory for Development Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: glibc-devel Requires: glibc-devel
@ -118,29 +95,29 @@ Requires: libbz2-devel
%package extra %package extra
Requires: ImageMagick = %{version} Requires: ImageMagick = %{version}
Requires: libMagickCore%{libspec}-%{clibver} = %{version} Requires: libMagickCore%{libspec}%{clibver} = %{version}
Summary: Viewer and Converter for Images - extra codecs Summary: Viewer and Converter for Images - extra codecs
#delegates configured in delegates.xml that imagemagick can use #delegates configured in delegates.xml that imagemagick can use
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
Recommends: autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf Recommends: autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf
%package -n libMagickCore%{libspec}-%{clibver} %package -n libMagickCore%{libspec}%{clibver}
Summary: Viewer and Converter for Images - runtime library Summary: Viewer and Converter for Images - runtime library
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
Suggests: ImageMagick-extra = %{version} Suggests: ImageMagick-extra = %{version}
%package -n libMagickWand%{libspec}-%{clibver} %package -n libMagickWand%{libspec}%{cwandver}
Summary: Viewer and Converter for Images - runtime library Summary: Viewer and Converter for Images - runtime library
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
%package -n libMagick++%{libspec}-%{cxxlibver} %package -n libMagick++%{libspec}%{cxxlibver}
Requires: ImageMagick Requires: ImageMagick
Summary: C++ Interface for ImageMagick - runtime library Summary: C++ Interface for ImageMagick - runtime library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
%package -n libMagick++-devel %package -n libMagick++-devel
Requires: ImageMagick-devel = %{version} Requires: ImageMagick-devel = %{version}
Requires: libMagick++%{libspec}-%{cxxlibver} = %{version} Requires: libMagick++%{libspec}%{cxxlibver} = %{version}
Requires: libstdc++-devel Requires: libstdc++-devel
Summary: C++ Interface for ImageMagick - files mandatory for development Summary: C++ Interface for ImageMagick - files mandatory for development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
@ -148,9 +125,7 @@ Group: Development/Libraries/C and C++
%package doc %package doc
Summary: Document Files for ImageMagick Library Summary: Document Files for ImageMagick Library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
%if 0%{?suse_version} >= 1120
BuildArch: noarch BuildArch: noarch
%endif
%description %description
ImageMagick is a robust collection of tools and libraries to read, ImageMagick is a robust collection of tools and libraries to read,
@ -188,7 +163,7 @@ different image formats. Image processing operations are available from
the command line as well as through C, C++, and PERL-based programming the command line as well as through C, C++, and PERL-based programming
interfaces. interfaces.
%description -n libMagickCore%{libspec}-%{clibver} %description -n libMagickCore%{libspec}%{clibver}
ImageMagick is a robust collection of tools and libraries to read, ImageMagick is a robust collection of tools and libraries to read,
write, and manipulate an image in many image formats, including popular write, and manipulate an image in many image formats, including popular
formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick,
@ -199,7 +174,7 @@ different image formats. Image processing operations are available from
the command line as well as through C, C++, and PERL-based programming the command line as well as through C, C++, and PERL-based programming
interfaces. interfaces.
%description -n libMagickWand%{libspec}-%{clibver} %description -n libMagickWand%{libspec}%{cwandver}
ImageMagick is a robust collection of tools and libraries to read, ImageMagick is a robust collection of tools and libraries to read,
write, and manipulate an image in many image formats, including popular write, and manipulate an image in many image formats, including popular
formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick,
@ -215,7 +190,7 @@ PerlMagick is an objected-oriented Perl interface to ImageMagick. Use
the module to read, manipulate, or write an image or image sequence the module to read, manipulate, or write an image or image sequence
from within a Perl script. This makes it suitable for Web CGI scripts. from within a Perl script. This makes it suitable for Web CGI scripts.
%description -n libMagick++%{libspec}-%{cxxlibver} %description -n libMagick++%{libspec}%{cxxlibver}
This is Magick++, the object-oriented C++ API for the ImageMagick This is Magick++, the object-oriented C++ API for the ImageMagick
image-processing library. image-processing library.
@ -250,108 +225,95 @@ HTML documentation for ImageMagick library and scene examples.
%prep %prep
%setup -q -n ImageMagick-%{source_version} %setup -q -n ImageMagick-%{source_version}
%patch0 %patch0 -p1
%patch1
%patch2
%patch3
%patch4
%patch11
%patch12 -p1 -R
%patch20 -p1
# remove executeable bits from per demos
chmod -x PerlMagick/demo/*.pl
%build %build
export CFLAGS="$RPM_OPT_FLAGS" %configure \
export CXXFLAGS="$RPM_OPT_FLAGS" --with-pic \
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
autoreconf --force --install -v
automake
%configure --with-pic \
--enable-shared \ --enable-shared \
--without-frozenpaths \ --without-frozenpaths \
--with-magick_plus_plus \ --with-magick_plus_plus \
--with-modules \ --with-modules \
--with-threads \ --with-threads \
--with-perl \ --with-perl \
--with-perl-options="INSTALLDIRS=vendor CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
--disable-static \ --disable-static \
--with-graphviz \ --with-graphviz \
--with-djvu \ --with-djvu \
--with-lcms2 \ --with-lcms2 \
--with-jbig \ --with-jbig \
--with-openjp2 \ --with-openjp2 \
%if 0%{?suse_version} >= 1140
--with-openexr \ --with-openexr \
%endif
--with-rsvg \ --with-rsvg \
--with-webp \ --with-webp \
--with-wmf \ --with-wmf \
--with-quantum-depth=%{quantum_depth} \ --with-quantum-depth=%{quantum_depth} \
--without-gcc-arch \ --without-gcc-arch \
--enable-pipes=no \ --enable-pipes=no \
--enable-indirect-reads=no --enable-indirect-reads=no \
--enable-reproducible-build=yes
# don't build together, PerlMagick could be miscompiled when using parallel build[1] # don't build together, PerlMagick could be miscompiled when using parallel build[1]
# [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec # [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec
make %{?_smp_mflags} all make %{?_smp_mflags} all
make -j1 perl-build make -j1 perl-build
# mostly because */demo is used later with %check
# polutting dir with .libs etc.
cp -r Magick++/demo Magick++/examples
cp -r PerlMagick/demo PerlMagick/examples
# other improvements
dos2unix www/api/*.php
chmod -x PerlMagick/demo/*.pl
%if 0%{?suse_version} >= 1140
%check %check
make check make check
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs
export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs
export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs
export MAGICK_CONFIGURE_PATH=$PWD/config export MAGICK_CONFIGURE_PATH=$PWD/config
cd PerlMagick cd PerlMagick
make test %ifarch i586
# TODO test is failing completely (19/19), wrong
# checksums
rm t/montage.t
%endif %endif
make test
cd ..
%install %install
%{__make} install \ %{__make} install \
DESTDIR=%{buildroot} \ DESTDIR=%{buildroot} \
pkgdocdir=%{_defaultdocdir}/%{name}/ pkgdocdir=%{_defaultdocdir}/%{name}-%{maj}/
%perl_process_packlist # symlink header file relative to /usr/include/ImageMagick-7/
# remove unneded files from Magick++/demo for %doc, but not in place # so that inclusions like wand/*.h and magick/*.h work
# they are needed for make check ln -s ./MagickCore %{buildroot}%{_includedir}/%{name}-%{maj}/magick
cp -r Magick++/demo . ln -s ./MagickWand %{buildroot}%{_includedir}/%{name}-%{maj}/wand
%{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} # these will be included via %doc
PATH='/bin:/usr/bin' find demo -type f -perm /111 -execdir %{__rm} -rf '{}' ';' rm -r %{buildroot}%{_datadir}/doc/%{name}-%{maj}/
%{__mv} demo/makefile.2 demo/Makefile mv -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml
### rm %{buildroot}%{_libdir}/*.la
%{__mv} -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml # remove RPATH from perl module
PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ perl_module=$(find %{buildroot}/usr/lib/perl5 -name '*.so')
-execdir %{__sed} -i -e 's@ -L/usr/src[^ ]*@@g' -e 's@ /usr/lib/libltdl.la@@g' '{}' ';' chmod 755 $perl_module
%{__rm} %{buildroot}%{_libdir}/*.la 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
#remove duplicates #remove duplicates
%if 0%{?suse_version} > 1020 %fdupes -s %{buildroot}%{_defaultdocdir}/%{name}-%{maj}
%fdupes -s %{buildroot}%{_defaultdocdir}/%{name}
%fdupes -s %{buildroot}%{_includedir}/%{name}-%{maj} %fdupes -s %{buildroot}%{_includedir}/%{name}-%{maj}
%fdupes -s %{buildroot}%{_libdir}/pkgconfig %fdupes -s %{buildroot}%{_libdir}/pkgconfig
%endif %perl_process_packlist
%post -n libMagickCore%{libspec}-%{clibver} -p /sbin/ldconfig %post -n libMagickCore%{libspec}%{clibver} -p /sbin/ldconfig
%postun -n libMagickCore%{libspec}-%{clibver} -p /sbin/ldconfig %postun -n libMagickCore%{libspec}%{clibver} -p /sbin/ldconfig
%post -n libMagickWand%{libspec}-%{clibver} -p /sbin/ldconfig %post -n libMagickWand%{libspec}%{cwandver} -p /sbin/ldconfig
%postun -n libMagickWand%{libspec}-%{clibver} -p /sbin/ldconfig %postun -n libMagickWand%{libspec}%{cwandver} -p /sbin/ldconfig
%post -n libMagick++%{libspec}-%{cxxlibver} -p /sbin/ldconfig %post -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig
%postun -n libMagick++%{libspec}-%{cxxlibver} -p /sbin/ldconfig %postun -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
@ -359,9 +321,9 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \
%doc %{_mandir}/man1/* %doc %{_mandir}/man1/*
%exclude %{_mandir}/man1/*-config.1.gz %exclude %{_mandir}/man1/*-config.1.gz
%files -n libMagickCore%{libspec}-%{clibver} %files -n libMagickCore%{libspec}%{clibver}
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE %doc LICENSE ChangeLog NEWS.txt
%dir %{_sysconfdir}/ImageMagick* %dir %{_sysconfdir}/ImageMagick*
%config %{_sysconfdir}/ImageMagick*/* %config %{_sysconfdir}/ImageMagick*/*
%{_libdir}/libMagickCore*.so.%{clibver}* %{_libdir}/libMagickCore*.so.%{clibver}*
@ -376,9 +338,9 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \
%{_libdir}/ImageMagick*/modules*/*/*.la %{_libdir}/ImageMagick*/modules*/*/*.la
%{_libdir}/ImageMagick*/config* %{_libdir}/ImageMagick*/config*
%files -n libMagickWand%{libspec}-%{clibver} %files -n libMagickWand%{libspec}%{cwandver}
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libMagickWand*.so.%{clibver}* %{_libdir}/libMagickWand*.so.%{cwandver}*
%files extra %files extra
%defattr(-,root,root) %defattr(-,root,root)
@ -395,48 +357,43 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \
%{_libdir}/libMagickCore*.so %{_libdir}/libMagickCore*.so
%{_libdir}/libMagickWand*.so %{_libdir}/libMagickWand*.so
%dir %{_includedir}/ImageMagick* %dir %{_includedir}/ImageMagick*
%{_includedir}/ImageMagick*/MagickCore
%{_includedir}/ImageMagick*/MagickWand
%{_includedir}/ImageMagick*/magick %{_includedir}/ImageMagick*/magick
%{_includedir}/ImageMagick*/wand %{_includedir}/ImageMagick*/wand
%{_bindir}/MagickCore-config %{_bindir}/MagickCore-config
%{_bindir}/MagickWand-config %{_bindir}/MagickWand-config
%{_bindir}/Magick-config
%{_bindir}/Wand-config
%{_libdir}/pkgconfig/MagickCore*.pc %{_libdir}/pkgconfig/MagickCore*.pc
%{_libdir}/pkgconfig/ImageMagick.pc %{_libdir}/pkgconfig/ImageMagick*.pc
%{_libdir}/pkgconfig/ImageMagick-*.pc %{_libdir}/pkgconfig/MagickWand*.pc
%{_libdir}/pkgconfig/*Wand*.pc
%doc %{_mandir}/man1/*-config.1.gz %doc %{_mandir}/man1/*-config.1.gz
%exclude %{_mandir}/man1/Magick++-config.1.gz %exclude %{_mandir}/man1/Magick++-config.1.gz
%files -n perl-PerlMagick %files -n perl-PerlMagick
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc PerlMagick/README.txt %doc PerlMagick/README.txt
%doc PerlMagick/demo %doc PerlMagick/examples
%doc %{_mandir}/man3/* %doc %{_mandir}/man3/*
%{perl_vendorarch}/auto/Image %{perl_vendorarch}/auto/Image
%{perl_vendorarch}/Image %{perl_vendorarch}/Image
%if 0%{?suse_version} < 1140
/var/adm/perl-modules/ImageMagick
%endif
%files -n libMagick++%{libspec}-%{cxxlibver} %files -n libMagick++%{libspec}%{cxxlibver}
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libMagick++*.so.%{cxxlibver}* %{_libdir}/libMagick++*.so.%{cxxlibver}*
%files -n libMagick++-devel %files -n libMagick++-devel
%defattr(-,root,root) %defattr(-,root,root)
%doc demo %doc Magick++/examples
%doc Magick++/NEWS Magick++/README Magick++/AUTHORS %doc Magick++/NEWS Magick++/README Magick++/AUTHORS
%{_libdir}/libMagick++*.so %{_libdir}/libMagick++*.so
%{_includedir}/ImageMagick*/Magick++.h %{_includedir}/ImageMagick*/Magick++.h
%{_includedir}/ImageMagick*/Magick++ %{_includedir}/ImageMagick*/Magick++
%{_bindir}/Magick++-config %{_bindir}/Magick++-config
%{_libdir}/pkgconfig/ImageMagick++*.pc
%{_libdir}/pkgconfig/Magick++*.pc %{_libdir}/pkgconfig/Magick++*.pc
%doc %{_mandir}/man1/Magick++-config.1.gz %doc %{_mandir}/man1/Magick++-config.1.gz
%files doc %files doc
%defattr(-,root,root) %defattr(-,root,root)
%{_defaultdocdir}/%{name} %{_defaultdocdir}/%{name}-%{maj}
%changelog %changelog

12
baselibs.conf
View File

@ -1,11 +1,11 @@
libMagickCore-6_Q16-4 libMagickCore-7_Q16HDRI2
libMagickWand-6_Q16-4 libMagickWand-7_Q16HDRI0
libMagick++-6_Q16-7 libMagick++-7_Q16HDRI2
ImageMagick-devel ImageMagick-devel
requires -ImageMagick-<targettype> requires -ImageMagick-<targettype>
requires "libMagickCore-6_Q16-4-<targettype> = <version>" requires "libMagickCore-7_Q16HDRI2-<targettype> = <version>"
requires "libMagickWand-6_Q16-4-<targettype> = <version>" requires "libMagickWand-7_Q16HDRI0-<targettype> = <version>"
libMagick++-devel libMagick++-devel
requires -ImageMagick-<targettype> requires -ImageMagick-<targettype>
requires "libMagick++-6_Q16-7-<targettype> = <version>" requires "libMagick++-7_Q16HDRI2-<targettype> = <version>"