From eb43637867138a7867012d6e6801f73c16f84bc87dda4aa6d9584c7fc39b1845 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 17 Oct 2019 12:25:51 +0000 Subject: [PATCH 1/3] Accepting request 739222 from home:RBrownSUSE:branches:graphics Remove obsolete Groups tag (fate#326485) OBS-URL: https://build.opensuse.org/request/show/739222 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=461 --- ImageMagick.changes | 5 +++++ ImageMagick.spec | 11 ----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index e78b62a..4edda93 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:24 UTC 2019 - Richard Brown + +- Remove obsolete Groups tag (fate#326485) + ------------------------------------------------------------------- Mon Oct 7 10:17:14 UTC 2019 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 2a1cb67..62784f2 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -37,7 +37,6 @@ Version: %{mfr_version}.%{mfr_revision} Release: 0 Summary: Viewer and Converter for Images License: ImageMagick -Group: Productivity/Graphics/Other URL: https://www.imagemagick.org Source0: https://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.bz2 Source1: baselibs.conf @@ -131,14 +130,12 @@ BuildRequires: pkgconfig(zlib) %package -n perl-PerlMagick Summary: Perl interface for ImageMagick -Group: Development/Libraries/Perl Requires: ImageMagick = %{version} Requires: libMagickCore%{libspec}%{clibver} = %{version} Requires: perl = %{perl_version} %package devel Summary: Development files for ImageMagick's C interface -Group: Development/Libraries/C and C++ Requires: ImageMagick = %{version} Requires: glibc-devel Requires: libMagickCore%{libspec}%{clibver} = %{version} @@ -153,7 +150,6 @@ Requires: libbz2-devel %if !%{debug_build} %package extra Summary: Extra codecs for the ImageMagick image viewer/converter -Group: Productivity/Graphics/Other Requires: ImageMagick = %{version} Requires: libMagickCore%{libspec}%{clibver} = %{version} Recommends: autotrace @@ -166,7 +162,6 @@ Recommends: transfig %package -n libMagickCore%{libspec}%{clibver} Summary: C runtime library for ImageMagick -Group: Productivity/Graphics/Other Recommends: ghostscript Suggests: %{name}-extra = %{version} Requires: imagick-%{config_spec} @@ -174,16 +169,13 @@ Recommends: %{config_spec}-SUSE %package -n libMagickWand%{libspec}%{cwandver} Summary: C runtime library for ImageMagick -Group: Productivity/Graphics/Other %package -n libMagick++%{libspec}%{cxxlibver} Summary: C++ interface runtime library for ImageMagick -Group: Development/Libraries/C and C++ Requires: %{name} %package -n libMagick++-devel Summary: Development files for ImageMagick's C++ interface -Group: Development/Libraries/C and C++ Requires: libMagick++%{libspec}%{cxxlibver} = %{version} Requires: libstdc++-devel %if 0%{?suse_version} >= 1315 @@ -194,21 +186,18 @@ Requires: %{name}-devel = %{version} %package doc Summary: Document Files for ImageMagick Library -Group: Documentation/HTML %if 0%{?suse_version} >= 1315 BuildArch: noarch %endif %package %{config_spec}-upstream Summary: Upstream Configuration Files -Group: Development/Libraries/C and C++ Provides: imagick-%{config_spec} Requires(post): update-alternatives Requires(postun): update-alternatives %package %{config_spec}-SUSE Summary: Upstream Configuration Files -Group: Development/Libraries/C and C++ Provides: imagick-%{config_spec} Requires(post): update-alternatives Requires(postun): update-alternatives From 81d40ee82903ee7a56bf0c8b6565d3b7c8d426c5f868dce9f3dd8a1cfd60994b Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 18 Oct 2019 09:15:49 +0000 Subject: [PATCH 2/3] Accepting request 741007 from openSUSE:Factory revert OBS-URL: https://build.opensuse.org/request/show/741007 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=462 --- ImageMagick.changes | 5 ----- ImageMagick.spec | 11 +++++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index 4edda93..e78b62a 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Oct 17 12:20:24 UTC 2019 - Richard Brown - -- Remove obsolete Groups tag (fate#326485) - ------------------------------------------------------------------- Mon Oct 7 10:17:14 UTC 2019 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 62784f2..2a1cb67 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -37,6 +37,7 @@ Version: %{mfr_version}.%{mfr_revision} Release: 0 Summary: Viewer and Converter for Images License: ImageMagick +Group: Productivity/Graphics/Other URL: https://www.imagemagick.org Source0: https://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.bz2 Source1: baselibs.conf @@ -130,12 +131,14 @@ BuildRequires: pkgconfig(zlib) %package -n perl-PerlMagick Summary: Perl interface for ImageMagick +Group: Development/Libraries/Perl Requires: ImageMagick = %{version} Requires: libMagickCore%{libspec}%{clibver} = %{version} Requires: perl = %{perl_version} %package devel Summary: Development files for ImageMagick's C interface +Group: Development/Libraries/C and C++ Requires: ImageMagick = %{version} Requires: glibc-devel Requires: libMagickCore%{libspec}%{clibver} = %{version} @@ -150,6 +153,7 @@ Requires: libbz2-devel %if !%{debug_build} %package extra Summary: Extra codecs for the ImageMagick image viewer/converter +Group: Productivity/Graphics/Other Requires: ImageMagick = %{version} Requires: libMagickCore%{libspec}%{clibver} = %{version} Recommends: autotrace @@ -162,6 +166,7 @@ Recommends: transfig %package -n libMagickCore%{libspec}%{clibver} Summary: C runtime library for ImageMagick +Group: Productivity/Graphics/Other Recommends: ghostscript Suggests: %{name}-extra = %{version} Requires: imagick-%{config_spec} @@ -169,13 +174,16 @@ Recommends: %{config_spec}-SUSE %package -n libMagickWand%{libspec}%{cwandver} Summary: C runtime library for ImageMagick +Group: Productivity/Graphics/Other %package -n libMagick++%{libspec}%{cxxlibver} Summary: C++ interface runtime library for ImageMagick +Group: Development/Libraries/C and C++ Requires: %{name} %package -n libMagick++-devel Summary: Development files for ImageMagick's C++ interface +Group: Development/Libraries/C and C++ Requires: libMagick++%{libspec}%{cxxlibver} = %{version} Requires: libstdc++-devel %if 0%{?suse_version} >= 1315 @@ -186,18 +194,21 @@ Requires: %{name}-devel = %{version} %package doc Summary: Document Files for ImageMagick Library +Group: Documentation/HTML %if 0%{?suse_version} >= 1315 BuildArch: noarch %endif %package %{config_spec}-upstream Summary: Upstream Configuration Files +Group: Development/Libraries/C and C++ Provides: imagick-%{config_spec} Requires(post): update-alternatives Requires(postun): update-alternatives %package %{config_spec}-SUSE Summary: Upstream Configuration Files +Group: Development/Libraries/C and C++ Provides: imagick-%{config_spec} Requires(post): update-alternatives Requires(postun): update-alternatives From 986834db6ab79f6613e70e92716e7c28126f54a090181044a354cbe97644d460 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 30 Oct 2019 09:52:40 +0000 Subject: [PATCH 3/3] - version update to 7.0.9.1 * Fixed numerous issues posted to GitHub (reference https://github.com/ImageMagick/ImageMagick/issues). * Support trim:background-color define for -trim option. - modified sources % baselibs.conf OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=463 --- ImageMagick-7.0.8-68.tar.bz2 | 3 --- ImageMagick-7.0.8-68.tar.bz2.asc | 17 ----------------- ImageMagick-7.0.9-1.tar.bz2 | 3 +++ ImageMagick-7.0.9-1.tar.bz2.asc | 17 +++++++++++++++++ ImageMagick.changes | 10 ++++++++++ ImageMagick.spec | 8 ++++---- baselibs.conf | 8 ++++---- 7 files changed, 38 insertions(+), 28 deletions(-) delete mode 100644 ImageMagick-7.0.8-68.tar.bz2 delete mode 100644 ImageMagick-7.0.8-68.tar.bz2.asc create mode 100644 ImageMagick-7.0.9-1.tar.bz2 create mode 100644 ImageMagick-7.0.9-1.tar.bz2.asc diff --git a/ImageMagick-7.0.8-68.tar.bz2 b/ImageMagick-7.0.8-68.tar.bz2 deleted file mode 100644 index 6f0c4ba..0000000 --- a/ImageMagick-7.0.8-68.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06dcd639326a9548bcdbfdb67488b2ddcfd0a5118e1032ad1b2d1e7cc01b1dd3 -size 11630976 diff --git a/ImageMagick-7.0.8-68.tar.bz2.asc b/ImageMagick-7.0.8-68.tar.bz2.asc deleted file mode 100644 index eddd0d8..0000000 --- a/ImageMagick-7.0.8-68.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAABAgAGBQJdmdHPAAoJEImrY9SCdzd6BIsP/iOU/s3O5vrwodPlNrzY/tms -xI/3eHl/my7xW6bJMgNBkVA2Uz+WZ/JlXavWtICP++dq/nMgJjda00L9r16A/ycE -9/IdTJIhs+SaXcu5nvdbzeeXps8Z+yzra2VuwXBpCkoQuTsxyKssNe40M36pZBgH -2Up2poFf+Df6Wm3xcHiNkjJALofbHLlL40BHlDbxfWOKZiAxmXVe1poaG1Kf8dED -v1ycSVc7yBAGS+R048pj47l+iYeBPvFsfaR1tAu/evp7UoXX0IZKB9HqtxLmSMCS -r5TAfzBRWU8a8t6czfSfOmNIkvtG9MQMErM2yA1LHYP0k7GT9YkONr/uuOF8Cq+7 -qoe6VJXbWgHCSxY4YM1SC1SJDYjn26QFP5GOLWgRhtfs4owqk5kS9e3+ZhWnbnXP -ox7ug2xMyWwGz9CWtWOVOXHvfnllPC+WPEbw/E+99Cnecbf1PGHNytPDHTGtakLN -Z3O56LJMO9XQmc22eFbrWitgT+uWgzAT8GGvcHa2gwRgmCzKCm8/tgi8pAJuRd+q -E2jA+FzJ7lvqHlNN2m+KZt2aUmjY6TbpEv0EdToWJFerKVhuquZKPyjkvRZCgM6h -Lxr/tBj9wNGLsYiWuh669oGT5ihgyQyBMGSlgp+GaT10ULhvxQwD/L6+GSAhvOPZ -4AkOZSh4ecEN8BxrCcqd -=+8Xt ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.9-1.tar.bz2 b/ImageMagick-7.0.9-1.tar.bz2 new file mode 100644 index 0000000..00dfe18 --- /dev/null +++ b/ImageMagick-7.0.9-1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c821d6fb974932bd40e1a4ff0b16aa3aa110b8176271769d98d42227ce40f028 +size 11634427 diff --git a/ImageMagick-7.0.9-1.tar.bz2.asc b/ImageMagick-7.0.9-1.tar.bz2.asc new file mode 100644 index 0000000..7c1eb90 --- /dev/null +++ b/ImageMagick-7.0.9-1.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJdttLDAAoJEImrY9SCdzd66AYP+gL/qaQ31ywKvPJJE6z4Q8Ls +0X6tsInK4I3/ZE90howwMW8/1pj4P7mpWa1ATJk5k2jHMRi+cwuabOpwvGVlxxcL +JyOFXpbHjLG8W88x3ddKfox1WYnXlQgpsPbsQH0sswBtT5xMPexctLQDYzCCaM+d +roaodpgdtgcKT7N6tRtig77RS5VoBVS6nxeYKVTlXI1UfIbcTWwDVQQU4bTPS2nb +BKcTakMkcNyPks60aQgpmDGwvU4T2oR9wIEovFP1sHm1eK7Ln8fLhmRQ7/8lrdp6 +3xhTP7UPPKL2V31tHcg07P1L4qpKcoUW/8YFh3s2SPTcw30OWuAYFlD5kbnpWfKh +ZgLX8qYamlFDWeOXQz+8Oj0Y1trcPj8PsiBiMDKGLY6GL4YpKG3Ma2VZQtWbywkB +RSP8Cw/H8UKsdpa2BnEy9WPjLIaDbZ5zv0/RPtAHFZ3GP2vYuyrqPv8ekuffUm0U ++IBtp4xALVPq/QP7aaIDUr3X8hRHgX+Dux9UFPDkUEZm2JDK1elDPtkSW4l0dwnh +J0uODGtnnh8OgPf/8YGYuh1QmdBFalTUBnPZnaLRrcN5Df1TtzJ9r0GJIL9irrrN +YBypGkGy3IEgiURktBBRoz+gKlQ6voGXsUSkOtQ7JKJ3HOvqDu8iXjChsRI1Bo7V +PwmgMc/gDsNl4mTLQeE7 +=RnPo +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index e78b62a..8f94251 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Oct 30 09:51:39 UTC 2019 - pgajdos@suse.com + +- version update to 7.0.9.1 + * Fixed numerous issues posted to GitHub (reference + https://github.com/ImageMagick/ImageMagick/issues). + * Support trim:background-color define for -trim option. +- modified sources + % baselibs.conf + ------------------------------------------------------------------- Mon Oct 7 10:17:14 UTC 2019 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 2a1cb67..93e4097 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -19,12 +19,12 @@ %define debug_build 0 %define asan_build 0 %define maj 7 -%define mfr_version %{maj}.0.8 -%define mfr_revision 68 +%define mfr_version %{maj}.0.9 +%define mfr_revision 1 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} -%define clibver 6 -%define cwandver 6 +%define clibver 7 +%define cwandver 7 %define cxxlibver 4 %define libspec -%{maj}_Q%{quantum_depth}HDRI %define config_dir ImageMagick-7 diff --git a/baselibs.conf b/baselibs.conf index 9a7fce0..a08f7ea 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,10 +1,10 @@ -libMagickCore-7_Q16HDRI6 -libMagickWand-7_Q16HDRI6 +libMagickCore-7_Q16HDRI7 +libMagickWand-7_Q16HDRI7 libMagick++-7_Q16HDRI4 ImageMagick-devel requires -ImageMagick- - requires "libMagickCore-7_Q16HDRI6- = " - requires "libMagickWand-7_Q16HDRI6- = " + requires "libMagickCore-7_Q16HDRI7- = " + requires "libMagickWand-7_Q16HDRI7- = " libMagick++-devel requires -ImageMagick- requires "libMagick++-7_Q16HDRI4- = "