From 508f724522dadb6dab6c73bc0080fea39fa6859645c88e19990754ff6c626b30 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 29 Mar 2017 08:10:26 +0000 Subject: [PATCH 1/4] Accepting request 483248 from home:pgajdos - updated to 7.0.5-3 * new branch - 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 - 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/483248 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=279 --- ImageMagick-6.6.8.9-doc.patch | 13 -- ImageMagick-6.6.8.9-examples.patch | 13 -- ImageMagick-6.7.6.1-no-dist-lzip.patch | 13 -- ...Magick-6.8.4.0-dont-build-in-install.patch | 17 -- ImageMagick-6.8.4.0-rpath.patch | 13 -- ImageMagick-6.8.5.7-no-XPMCompliance.patch | 13 -- ImageMagick-6.9.8-2.tar.xz | 3 - ImageMagick-6.9.8-2.tar.xz.asc | 16 -- ImageMagick-7.0.5-3.tar.xz | 3 + ImageMagick-7.0.5-3.tar.xz.asc | 16 ++ ... ImageMagick-disable-insecure-coders.patch | 0 ImageMagick-montage.t.patch | 25 --- ImageMagick.changes | 16 ++ ImageMagick.spec | 203 +++++++----------- baselibs.conf | 12 +- 15 files changed, 121 insertions(+), 255 deletions(-) delete mode 100644 ImageMagick-6.6.8.9-doc.patch delete mode 100644 ImageMagick-6.6.8.9-examples.patch delete mode 100644 ImageMagick-6.7.6.1-no-dist-lzip.patch delete mode 100644 ImageMagick-6.8.4.0-dont-build-in-install.patch delete mode 100644 ImageMagick-6.8.4.0-rpath.patch delete mode 100644 ImageMagick-6.8.5.7-no-XPMCompliance.patch delete mode 100644 ImageMagick-6.9.8-2.tar.xz delete mode 100644 ImageMagick-6.9.8-2.tar.xz.asc create mode 100644 ImageMagick-7.0.5-3.tar.xz create mode 100644 ImageMagick-7.0.5-3.tar.xz.asc rename ImageMagick-6.8.8-1-disable-insecure-coders.patch => ImageMagick-disable-insecure-coders.patch (100%) delete mode 100644 ImageMagick-montage.t.patch diff --git a/ImageMagick-6.6.8.9-doc.patch b/ImageMagick-6.6.8.9-doc.patch deleted file mode 100644 index 69cb334..0000000 --- a/ImageMagick-6.6.8.9-doc.patch +++ /dev/null @@ -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 diff --git a/ImageMagick-6.6.8.9-examples.patch b/ImageMagick-6.6.8.9-examples.patch deleted file mode 100644 index 8775573..0000000 --- a/ImageMagick-6.6.8.9-examples.patch +++ /dev/null @@ -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 -+ -+ -+ diff --git a/ImageMagick-6.7.6.1-no-dist-lzip.patch b/ImageMagick-6.7.6.1-no-dist-lzip.patch deleted file mode 100644 index ad1fb32..0000000 --- a/ImageMagick-6.7.6.1-no-dist-lzip.patch +++ /dev/null @@ -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]) - - # diff --git a/ImageMagick-6.8.4.0-dont-build-in-install.patch b/ImageMagick-6.8.4.0-dont-build-in-install.patch deleted file mode 100644 index 81c518d..0000000 --- a/ImageMagick-6.8.4.0-dont-build-in-install.patch +++ /dev/null @@ -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 - diff --git a/ImageMagick-6.8.4.0-rpath.patch b/ImageMagick-6.8.4.0-rpath.patch deleted file mode 100644 index 1313588..0000000 --- a/ImageMagick-6.8.4.0-rpath.patch +++ /dev/null @@ -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 diff --git a/ImageMagick-6.8.5.7-no-XPMCompliance.patch b/ImageMagick-6.8.5.7-no-XPMCompliance.patch deleted file mode 100644 index ccd5cc8..0000000 --- a/ImageMagick-6.8.5.7-no-XPMCompliance.patch +++ /dev/null @@ -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; diff --git a/ImageMagick-6.9.8-2.tar.xz b/ImageMagick-6.9.8-2.tar.xz deleted file mode 100644 index 2012057..0000000 --- a/ImageMagick-6.9.8-2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be809993975dbc84b69987a8b914b656849351396c519b54199083967fceb143 -size 9041700 diff --git a/ImageMagick-6.9.8-2.tar.xz.asc b/ImageMagick-6.9.8-2.tar.xz.asc deleted file mode 100644 index 2f081c9..0000000 --- a/ImageMagick-6.9.8-2.tar.xz.asc +++ /dev/null @@ -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----- diff --git a/ImageMagick-7.0.5-3.tar.xz b/ImageMagick-7.0.5-3.tar.xz new file mode 100644 index 0000000..b3bdfb5 --- /dev/null +++ b/ImageMagick-7.0.5-3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbc0a1cc0e4e3d4e3c772724fcbfe24a00ff4434c8b12c513c447a5fb422ffa6 +size 8307316 diff --git a/ImageMagick-7.0.5-3.tar.xz.asc b/ImageMagick-7.0.5-3.tar.xz.asc new file mode 100644 index 0000000..f26ba52 --- /dev/null +++ b/ImageMagick-7.0.5-3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIbBAABAgAGBQJYzwUmAAoJEImrY9SCdzd6R6MP932CiZKRR/0f3M1w33tM9Syx +5seARjT5K6M/WC2kapW/84Sc+KiQf1i1PFDLwekjWcjwprQiYV0Y44GZ0SQ2sSyw +qN/9k84Vwo3BLu/OJzuVR8ufmOULLcdkuVbUoQdegYzoEr4iG0n08DNg7jaqNac8 ++2e4gzvKEyNEC8ClB9vR89dPg64cmeSPn87Vm4PzPQ41NbtWcjRQZEfBr6QL/TIE +gUkZEimUsm3pKd8dTnqDatDwV350L3yAz5EuK3sm++wT6wnoMgkeLoSCj30RL9R9 +KidgZBlRkxqrb/6FeSMLgu0tX59xbYTEvCsxQ+jOtKFTRfsKn8mh0oeMRRjZdir5 +3qgKgIO94s9zR6eYPnDp0HWAXOH6Ij+ls0cICG36d3MCFptJp0ekBn9toheAdOlM +7m49IuLd0dOi0KqzAKKlk/DQb/Eo6XewasDyvHfQc42Y8GCzDmff5XcPi1UxWj6V +DaD2cPxDr01gBIDM160dzOMisLnT40vuo7eCbBKqdqg8T6r9uwB25dvbTjXSu8A0 +5xG8HAtrHlA7LFts6WaiZtktlBHH/N8YXMoL/1bKS8HIogy8KEv29Yhv5qevl0x9 +IDLfYYaW8fZB1kThqZAwAuSXAXG7lfaeU4sUQ4+uan4UYBDURyzdpKoQQFzmGABV +eeX9wNWqAXM8Saqk+EI= +=p5gL +-----END PGP SIGNATURE----- diff --git a/ImageMagick-6.8.8-1-disable-insecure-coders.patch b/ImageMagick-disable-insecure-coders.patch similarity index 100% rename from ImageMagick-6.8.8-1-disable-insecure-coders.patch rename to ImageMagick-disable-insecure-coders.patch diff --git a/ImageMagick-montage.t.patch b/ImageMagick-montage.t.patch deleted file mode 100644 index 6dec273..0000000 --- a/ImageMagick-montage.t.patch +++ /dev/null @@ -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 -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'); - - # diff --git a/ImageMagick.changes b/ImageMagick.changes index 89728df..81dadb3 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Mar 22 11:26:21 UTC 2017 - pgajdos@suse.com + +- updated to 7.0.5-3 + * new branch +- 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 +- 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 diff --git a/ImageMagick.spec b/ImageMagick.spec index 4872917..5285c71 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -19,10 +19,10 @@ Name: ImageMagick BuildRequires: autoconf >= 2.69 +BuildRequires: chrpath BuildRequires: dcraw -%if 0%{?suse_version} >= 1140 BuildRequires: dejavu-fonts -%endif +BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: fftw3-devel BuildRequires: freetype2-devel @@ -35,9 +35,7 @@ BuildRequires: libjasper-devel BuildRequires: libjbig-devel BuildRequires: libjpeg-devel BuildRequires: liblcms2-devel -%if 0%{?suse_version} >= 1140 BuildRequires: liblqr-devel -%endif BuildRequires: librsvg-devel BuildRequires: libtiff-devel >= 4.0.3 BuildRequires: libtool @@ -45,71 +43,50 @@ BuildRequires: libwebp-devel BuildRequires: libwmf-devel BuildRequires: libxml2-devel BuildRequires: lzma-devel -%if 0%{?suse_version} >= 1310 BuildRequires: mupdf-devel-static -%endif -%if 0%{?suse_version} >= 1140 BuildRequires: openexr-devel -%endif BuildRequires: openjpeg2-devel >= 2.1.0 -%if 0%{?suse_version} >= 1140 BuildRequires: p7zip -%endif BuildRequires: pango-devel BuildRequires: pkgconfig BuildRequires: xdg-utils BuildRequires: xz BuildRequires: zip -%define maj 6 -%define mfr_version %{maj}.9.8 -%define mfr_revision 2 +%define maj 7 +%define mfr_version %{maj}.0.5 +%define mfr_revision 3 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} -%define clibver 4 -%define cxxlibver 7 -%define libspec -%{maj}_Q%{quantum_depth} +%define clibver 2 +%define cwandver 0 +%define cxxlibver 2 +%define libspec -%{maj}_Q%{quantum_depth}HDRI Version: %{mfr_version}.%{mfr_revision} Release: 0 Summary: Viewer and Converter for Images License: ImageMagick Group: Productivity/Graphics/Other Url: http://www.imagemagick.org -Source: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz -# To get mtime of file -Source1: ImageMagick.changes -Source2: baselibs.conf -Source3: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz.asc -Source4: ImageMagick.keyring +Source0: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz +Source1: baselibs.conf +Source2: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz.asc +Source3: ImageMagick.keyring # suse specific patches -Patch0: ImageMagick-6.6.8.9-examples.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 +Patch0: ImageMagick-disable-insecure-coders.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick Requires: ImageMagick = %{version} -Requires: libMagickCore%{libspec}-%{clibver} = %{version} +Requires: libMagickCore%{libspec}%{clibver} = %{version} Requires: perl = %{perl_version} Summary: Perl interface for ImageMagick Group: Development/Libraries/Perl %package devel Requires: ImageMagick = %{version} -Requires: libMagickCore%{libspec}-%{clibver} = %{version} -Requires: libMagickWand%{libspec}-%{clibver} = %{version} +Requires: libMagickCore%{libspec}%{clibver} = %{version} +Requires: libMagickWand%{libspec}%{cwandver} = %{version} Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ Requires: glibc-devel @@ -118,29 +95,29 @@ Requires: libbz2-devel %package extra Requires: ImageMagick = %{version} -Requires: libMagickCore%{libspec}-%{clibver} = %{version} +Requires: libMagickCore%{libspec}%{clibver} = %{version} Summary: Viewer and Converter for Images - extra codecs #delegates configured in delegates.xml that imagemagick can use Group: Productivity/Graphics/Other 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 Group: Productivity/Graphics/Other Suggests: ImageMagick-extra = %{version} -%package -n libMagickWand%{libspec}-%{clibver} +%package -n libMagickWand%{libspec}%{cwandver} Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other -%package -n libMagick++%{libspec}-%{cxxlibver} +%package -n libMagick++%{libspec}%{cxxlibver} Requires: ImageMagick Summary: C++ Interface for ImageMagick - runtime library Group: Development/Libraries/C and C++ %package -n libMagick++-devel Requires: ImageMagick-devel = %{version} -Requires: libMagick++%{libspec}-%{cxxlibver} = %{version} +Requires: libMagick++%{libspec}%{cxxlibver} = %{version} Requires: libstdc++-devel Summary: C++ Interface for ImageMagick - files mandatory for development Group: Development/Libraries/C and C++ @@ -148,9 +125,7 @@ Group: Development/Libraries/C and C++ %package doc Summary: Document Files for ImageMagick Library Group: Development/Libraries/C and C++ -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif %description 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 interfaces. -%description -n libMagickCore%{libspec}-%{clibver} +%description -n libMagickCore%{libspec}%{clibver} ImageMagick is a robust collection of tools and libraries to read, write, and manipulate an image in many image formats, including popular 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 interfaces. -%description -n libMagickWand%{libspec}-%{clibver} +%description -n libMagickWand%{libspec}%{cwandver} ImageMagick is a robust collection of tools and libraries to read, write, and manipulate an image in many image formats, including popular 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 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 image-processing library. @@ -250,108 +225,95 @@ HTML documentation for ImageMagick library and scene examples. %prep %setup -q -n ImageMagick-%{source_version} -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -%patch11 -%patch12 -p1 -R -%patch20 -p1 - -# remove executeable bits from per demos -chmod -x PerlMagick/demo/*.pl +%patch0 -p1 %build -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 -autoreconf --force --install -v -automake -%configure --with-pic \ +%configure \ + --with-pic \ --enable-shared \ --without-frozenpaths \ --with-magick_plus_plus \ --with-modules \ --with-threads \ --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 \ --with-graphviz \ --with-djvu \ --with-lcms2 \ --with-jbig \ --with-openjp2 \ -%if 0%{?suse_version} >= 1140 --with-openexr \ -%endif --with-rsvg \ --with-webp \ --with-wmf \ --with-quantum-depth=%{quantum_depth} \ --without-gcc-arch \ --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] # [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec make %{?_smp_mflags} all 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 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_FILTER_PATH=$PWD/filters/.libs export MAGICK_CONFIGURE_PATH=$PWD/config cd PerlMagick -make test +%ifarch i586 +# TODO test is failing completely (19/19), wrong +# checksums +rm t/montage.t %endif +make test +cd .. %install %{__make} install \ DESTDIR=%{buildroot} \ - pkgdocdir=%{_defaultdocdir}/%{name}/ -%perl_process_packlist -# remove unneded files from Magick++/demo for %doc, but not in place -# they are needed for make check -cp -r Magick++/demo . -%{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} -PATH='/bin:/usr/bin' find demo -type f -perm /111 -execdir %{__rm} -rf '{}' ';' -%{__mv} demo/makefile.2 demo/Makefile -### -%{__mv} -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml -PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ - -execdir %{__sed} -i -e 's@ -L/usr/src[^ ]*@@g' -e 's@ /usr/lib/libltdl.la@@g' '{}' ';' -%{__rm} %{buildroot}%{_libdir}/*.la - + pkgdocdir=%{_defaultdocdir}/%{name}-%{maj}/ +# symlink header file relative to /usr/include/ImageMagick-7/ +# so that inclusions like wand/*.h and magick/*.h work +ln -s ./MagickCore %{buildroot}%{_includedir}/%{name}-%{maj}/magick +ln -s ./MagickWand %{buildroot}%{_includedir}/%{name}-%{maj}/wand +# these will be included via %doc +rm -r %{buildroot}%{_datadir}/doc/%{name}-%{maj}/ +mv -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml +rm %{buildroot}%{_libdir}/*.la +# remove RPATH from perl module +perl_module=$(find %{buildroot}/usr/lib/perl5 -name '*.so') +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 #remove duplicates -%if 0%{?suse_version} > 1020 -%fdupes -s %{buildroot}%{_defaultdocdir}/%{name} +%fdupes -s %{buildroot}%{_defaultdocdir}/%{name}-%{maj} %fdupes -s %{buildroot}%{_includedir}/%{name}-%{maj} %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 %defattr(-,root,root) @@ -359,9 +321,9 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ %doc %{_mandir}/man1/* %exclude %{_mandir}/man1/*-config.1.gz -%files -n libMagickCore%{libspec}-%{clibver} +%files -n libMagickCore%{libspec}%{clibver} %defattr(-,root,root) -%doc LICENSE +%doc LICENSE ChangeLog NEWS.txt %dir %{_sysconfdir}/ImageMagick* %config %{_sysconfdir}/ImageMagick*/* %{_libdir}/libMagickCore*.so.%{clibver}* @@ -376,9 +338,9 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ %{_libdir}/ImageMagick*/modules*/*/*.la %{_libdir}/ImageMagick*/config* -%files -n libMagickWand%{libspec}-%{clibver} +%files -n libMagickWand%{libspec}%{cwandver} %defattr(-,root,root) -%{_libdir}/libMagickWand*.so.%{clibver}* +%{_libdir}/libMagickWand*.so.%{cwandver}* %files extra %defattr(-,root,root) @@ -395,48 +357,43 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ %{_libdir}/libMagickCore*.so %{_libdir}/libMagickWand*.so %dir %{_includedir}/ImageMagick* +%{_includedir}/ImageMagick*/MagickCore +%{_includedir}/ImageMagick*/MagickWand %{_includedir}/ImageMagick*/magick %{_includedir}/ImageMagick*/wand %{_bindir}/MagickCore-config %{_bindir}/MagickWand-config -%{_bindir}/Magick-config -%{_bindir}/Wand-config %{_libdir}/pkgconfig/MagickCore*.pc -%{_libdir}/pkgconfig/ImageMagick.pc -%{_libdir}/pkgconfig/ImageMagick-*.pc -%{_libdir}/pkgconfig/*Wand*.pc +%{_libdir}/pkgconfig/ImageMagick*.pc +%{_libdir}/pkgconfig/MagickWand*.pc %doc %{_mandir}/man1/*-config.1.gz %exclude %{_mandir}/man1/Magick++-config.1.gz %files -n perl-PerlMagick %defattr(-,root,root,-) %doc PerlMagick/README.txt -%doc PerlMagick/demo +%doc PerlMagick/examples %doc %{_mandir}/man3/* %{perl_vendorarch}/auto/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) %{_libdir}/libMagick++*.so.%{cxxlibver}* %files -n libMagick++-devel %defattr(-,root,root) -%doc demo +%doc Magick++/examples %doc Magick++/NEWS Magick++/README Magick++/AUTHORS %{_libdir}/libMagick++*.so %{_includedir}/ImageMagick*/Magick++.h %{_includedir}/ImageMagick*/Magick++ %{_bindir}/Magick++-config -%{_libdir}/pkgconfig/ImageMagick++*.pc %{_libdir}/pkgconfig/Magick++*.pc %doc %{_mandir}/man1/Magick++-config.1.gz %files doc %defattr(-,root,root) -%{_defaultdocdir}/%{name} +%{_defaultdocdir}/%{name}-%{maj} %changelog diff --git a/baselibs.conf b/baselibs.conf index ad90199..e0189f0 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,11 +1,11 @@ -libMagickCore-6_Q16-4 -libMagickWand-6_Q16-4 -libMagick++-6_Q16-7 +libMagickCore-7_Q16HDRI2 +libMagickWand-7_Q16HDRI0 +libMagick++-7_Q16HDRI2 ImageMagick-devel requires -ImageMagick- - requires "libMagickCore-6_Q16-4- = " - requires "libMagickWand-6_Q16-4- = " + requires "libMagickCore-7_Q16HDRI2- = " + requires "libMagickWand-7_Q16HDRI0- = " libMagick++-devel requires -ImageMagick- - requires "libMagick++-6_Q16-7- = " + requires "libMagick++-7_Q16HDRI2- = " From 6dcfa1f93d272e85caf1aded21cb3aedcd6c1ba714e74be4a5bb621485f6ef6f Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 29 Mar 2017 08:12:22 +0000 Subject: [PATCH 2/4] * new branch, see https://www.imagemagick.org/script/porting.php OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=280 --- ImageMagick.changes | 3 ++- ImageMagick.spec | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index 81dadb3..5487d08 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -2,7 +2,8 @@ Wed Mar 22 11:26:21 UTC 2017 - pgajdos@suse.com - updated to 7.0.5-3 - * new branch + * 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 diff --git a/ImageMagick.spec b/ImageMagick.spec index 5285c71..4189052 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -68,7 +68,7 @@ Summary: Viewer and Converter for Images License: ImageMagick Group: Productivity/Graphics/Other Url: http://www.imagemagick.org -Source0: 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 Source1: baselibs.conf Source2: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz.asc Source3: ImageMagick.keyring From 4ef38fdd39d339c51c0ce105684836544f19638264868104716ba28877d2d4bd Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 29 Mar 2017 08:29:16 +0000 Subject: [PATCH 3/4] . ImageMagick-6.8.5.7-no-XPMCompliance.patch OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=281 --- ImageMagick.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/ImageMagick.changes b/ImageMagick.changes index 5487d08..3c97dbe 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -11,6 +11,7 @@ Wed Mar 22 11:26:21 UTC 2017 - pgajdos@suse.com . 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 From f088a49d0c334e4a4b3e09b919878105bb94b8e8e60fb85ea9ac717baadfdbfb Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 29 Mar 2017 09:04:27 +0000 Subject: [PATCH 4/4] - updated to 7.0.5-4 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=282 --- ImageMagick-7.0.5-3.tar.xz | 3 --- ImageMagick-7.0.5-3.tar.xz.asc | 16 ---------------- ImageMagick-7.0.5-4.tar.xz | 3 +++ ImageMagick-7.0.5-4.tar.xz.asc | 16 ++++++++++++++++ ImageMagick.changes | 2 +- ImageMagick.spec | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 ImageMagick-7.0.5-3.tar.xz delete mode 100644 ImageMagick-7.0.5-3.tar.xz.asc create mode 100644 ImageMagick-7.0.5-4.tar.xz create mode 100644 ImageMagick-7.0.5-4.tar.xz.asc diff --git a/ImageMagick-7.0.5-3.tar.xz b/ImageMagick-7.0.5-3.tar.xz deleted file mode 100644 index b3bdfb5..0000000 --- a/ImageMagick-7.0.5-3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dbc0a1cc0e4e3d4e3c772724fcbfe24a00ff4434c8b12c513c447a5fb422ffa6 -size 8307316 diff --git a/ImageMagick-7.0.5-3.tar.xz.asc b/ImageMagick-7.0.5-3.tar.xz.asc deleted file mode 100644 index f26ba52..0000000 --- a/ImageMagick-7.0.5-3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIbBAABAgAGBQJYzwUmAAoJEImrY9SCdzd6R6MP932CiZKRR/0f3M1w33tM9Syx -5seARjT5K6M/WC2kapW/84Sc+KiQf1i1PFDLwekjWcjwprQiYV0Y44GZ0SQ2sSyw -qN/9k84Vwo3BLu/OJzuVR8ufmOULLcdkuVbUoQdegYzoEr4iG0n08DNg7jaqNac8 -+2e4gzvKEyNEC8ClB9vR89dPg64cmeSPn87Vm4PzPQ41NbtWcjRQZEfBr6QL/TIE -gUkZEimUsm3pKd8dTnqDatDwV350L3yAz5EuK3sm++wT6wnoMgkeLoSCj30RL9R9 -KidgZBlRkxqrb/6FeSMLgu0tX59xbYTEvCsxQ+jOtKFTRfsKn8mh0oeMRRjZdir5 -3qgKgIO94s9zR6eYPnDp0HWAXOH6Ij+ls0cICG36d3MCFptJp0ekBn9toheAdOlM -7m49IuLd0dOi0KqzAKKlk/DQb/Eo6XewasDyvHfQc42Y8GCzDmff5XcPi1UxWj6V -DaD2cPxDr01gBIDM160dzOMisLnT40vuo7eCbBKqdqg8T6r9uwB25dvbTjXSu8A0 -5xG8HAtrHlA7LFts6WaiZtktlBHH/N8YXMoL/1bKS8HIogy8KEv29Yhv5qevl0x9 -IDLfYYaW8fZB1kThqZAwAuSXAXG7lfaeU4sUQ4+uan4UYBDURyzdpKoQQFzmGABV -eeX9wNWqAXM8Saqk+EI= -=p5gL ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.5-4.tar.xz b/ImageMagick-7.0.5-4.tar.xz new file mode 100644 index 0000000..778ebbc --- /dev/null +++ b/ImageMagick-7.0.5-4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a1dde5bdfec0fc549955a051be25b7ff96dfb192060997699e43c7ce0f06ab2 +size 8316148 diff --git a/ImageMagick-7.0.5-4.tar.xz.asc b/ImageMagick-7.0.5-4.tar.xz.asc new file mode 100644 index 0000000..29d6ad1 --- /dev/null +++ b/ImageMagick-7.0.5-4.tar.xz.asc @@ -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----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 3c97dbe..24fc6d2 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Mar 22 11:26:21 UTC 2017 - pgajdos@suse.com -- updated to 7.0.5-3 +- updated to 7.0.5-4 * new branch, see https://www.imagemagick.org/script/porting.php - deleted unneded patches diff --git a/ImageMagick.spec b/ImageMagick.spec index 4189052..c4f47bd 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -55,7 +55,7 @@ BuildRequires: zip %define maj 7 %define mfr_version %{maj}.0.5 -%define mfr_revision 3 +%define mfr_revision 4 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 2