From 661ea621a05883df9b161895d0b302b9b01b650adc4258e2f969fdd67318bd20 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Fri, 24 Jul 2015 14:48:42 +0000 Subject: [PATCH 1/2] Accepting request 318218 from home:weberho:branches:graphics - update to 6.9.1-9 - Removed duplicates - Only libMagickCore and ImageMagick-doc contains the LICENSE file. Other libraries do not longer contain it, as they always require libMagickCore to be instaleld. - Moved documentation to the ImageMagick-doc package. - Removed executable bits from perl documentation-examples - Added configurations for: * graphviz * lcms2 (Little CMS 2 color management) * jbig * openjp2 (JPEG 2000) * openexr * webp OBS-URL: https://build.opensuse.org/request/show/318218 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=238 --- ImageMagick-6.9.1-6.tar.xz | 3 --- ImageMagick-6.9.1-6.tar.xz.asc | 17 -------------- ImageMagick-6.9.1-9.tar.xz | 3 +++ ImageMagick-6.9.1-9.tar.xz.asc | 17 ++++++++++++++ ImageMagick.changes | 43 ++++++++++++++++++++++++++++++++++ ImageMagick.spec | 40 ++++++++++++++++++------------- 6 files changed, 87 insertions(+), 36 deletions(-) delete mode 100644 ImageMagick-6.9.1-6.tar.xz delete mode 100644 ImageMagick-6.9.1-6.tar.xz.asc create mode 100644 ImageMagick-6.9.1-9.tar.xz create mode 100644 ImageMagick-6.9.1-9.tar.xz.asc diff --git a/ImageMagick-6.9.1-6.tar.xz b/ImageMagick-6.9.1-6.tar.xz deleted file mode 100644 index f76115e..0000000 --- a/ImageMagick-6.9.1-6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d83934df129833f9e8696017182d8bbca8189842bbd2705c24729fed8db3358 -size 8276660 diff --git a/ImageMagick-6.9.1-6.tar.xz.asc b/ImageMagick-6.9.1-6.tar.xz.asc deleted file mode 100644 index 2ca46ce..0000000 --- a/ImageMagick-6.9.1-6.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJVhVtYAAoJEImrY9SCdzd6jU4P/RFZuvCZ1Yvm5hcz8TqLyJYz -fP1pRXn6LrljUh96xTI5qf+/hEHK/0khzm339XGswhwSkIJ0mex/xGyUbgDRvJIq -wWKJHkqRkEDFzJugU2w/3r9u0fu6Hbwdsv/8WWxNKoSIylNhKE0n1aR6LJ0RRdFz -AO+7MQjHFhWEmprwU9rnN2hI+pWp3njYesRz5B1ZikwtKIV79tDVisk0837CowrR -9OTEofIMqOfMz3K4U5zZx4Ent5705PEh8OGdVL6AdCNUWJIcw1oqzFiam5pWysXW -+hjTHv1bQGdtlu/6Z+re9Xwfm8wiQOzdb5w4LdKu9GmZQ51e5w8AQY/qpPRAzAvX -AxVX5wwZa9CQuHg+4W3VC/hdLIzQqgQioEhfmNxxmbdoWHN9XGwsmhw6O4Ad6mUx -W7U7H1HpFBLJ60Ndq2zcp4f225OjIQmmcL0fBJOtfQACa66wLMBh2LziGERvCJES -R+1hL9BgXHs353mppIokP1CI6UtEpO/eTOmbyBvTpTUS6H8eYpliUYD6jSfjD0+E -Sdw8GZgRlrEOuC7cnhOGyQjzd3dIAMpfowS57zRAU75pvqNWZaXHuYWOvg09ajdd -KoTuzrVbN1R5EzutwQagCqK91w3GST1vfEWXKCCqicjO8ZJtH4cfcDvr0XpIosSa -VvPFCDMUAnoSAU2tsuJi -=OyiI ------END PGP SIGNATURE----- diff --git a/ImageMagick-6.9.1-9.tar.xz b/ImageMagick-6.9.1-9.tar.xz new file mode 100644 index 0000000..bc8b6cd --- /dev/null +++ b/ImageMagick-6.9.1-9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83cd785caeb26a171e185b5deba2900c5b73e79c97364caa4c879d26c9f4a91b +size 8285744 diff --git a/ImageMagick-6.9.1-9.tar.xz.asc b/ImageMagick-6.9.1-9.tar.xz.asc new file mode 100644 index 0000000..0ca7bb6 --- /dev/null +++ b/ImageMagick-6.9.1-9.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJVqn81AAoJEImrY9SCdzd6N8UP/1NAgz5zhhE/VAvKQVP35lWK +PUR68/hkQClpv2Uq07TWsj6kQkDYTEySH+4s9tulJRifFoog4oH0WOkGUDpMj6jz +ZjAmnob5lxa4AGSKL5Bjpu1GNr80rqHvardpZcIhTmACQ5GU2tbGb5j0Q2XXlp9I +XrR6EFowsVerB5UTIh+hRCNmujS6DvtfV6red1QBtXoqCqdFG4WBAWy1Tg0kQe8I +1q0cdBSLDu7jvtG4nSHTm/JHOpoQH5uuRwcQ1BBkqQndGegfY5tYKzJNOxYGx6SI +rBZwVL4u7wleRl6lgLkX5mtny2ow24w+tHBobrvCkSW03NVPqgWgGU3fWVIdV4gw +A35j0OqfoxmkSwqmCSw01DEByDjZRhyVjP437E1rTX2l2H00Ptych3ygQ+kU5nza +RcTPycqBW3ATRuw0oXrh6M+2OE1J8yALtVJMLvLnUTS3kLEIUtjB+LKhr2FUCGhU +ecTzBapvH+bSF8E/jWX8HxkLyRZpA96DxnaAe6sED/WHinPC0isH3CztjqySmYWU +dOZSKZyRMzV2nK8QQkwI7yMK931/G5/inN8kObbZMhUEKoEeMVIgXrhLGtnh+P2c +phFf8jt7W/+s0LnyHUtcChEMS79tX9fG+VV1RpgBS0nbAOmoAzYIsIiOWFowtHdZ ++nDQyrmJZNCoJJ55d7T0 +=NIEF +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index c4ead98..5a7a656 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Thu Jul 23 08:59:31 UTC 2015 - jweberhofer@weberhofer.at + +- Removed duplicates + +- Only libMagickCore and ImageMagick-doc contains the LICENSE file. Other + libraries do not longer contain it, as they always require libMagickCore + to be instaleld. + +- Moved documentation to the ImageMagick-doc package. + +- Removed executable bits from perl documentation-examples + +- Added configurations for: + * graphviz + * lcms2 (Little CMS 2 color management) + * jbig + * openjp2 (JPEG 2000) + * openexr + * webp + +- update to 6.9.1-9 + * Fixed issue with radial gradient in MVG (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=27995). + +- update to 6.9.1-8 + * New version 6.9.1-8, SVN revision 19167. + * Correct install location of the Magick++ headers (reference + https://github.com/ImageMagick/ImageMagick/pull/17/commits). + * Different gif cropping behavior between versions (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28013). + * Cannot read properly simple psd file (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28002). + +- update to 6.9.1-7 + * Fixed and escaped output of the json coder. (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&p=27894). + * Support BPG image format (respects -quality option). + * A bordered transparent image now remains transparent (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=5&t=27937). + * The -update option behavior restored (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=27939). + ------------------------------------------------------------------- Wed Jul 1 15:24:30 UTC 2015 - jweberhofer@weberhofer.at diff --git a/ImageMagick.spec b/ImageMagick.spec index 85bc1d7..eefa94c 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -63,7 +63,7 @@ BuildRequires: zip %define maj 6 %define mfr_version %{maj}.9.1 -%define mfr_revision 6 +%define mfr_revision 9 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 2 @@ -252,6 +252,9 @@ HTML documentation for ImageMagick library and scene examples. %patch4 -p1 %patch11 -p1 +# remove executeable bits from per demos +chmod -x PerlMagick/demo/*.pl + %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" @@ -276,11 +279,19 @@ automake --with-perl \ --with-perl-options="INSTALLDIRS=vendor CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ --disable-static \ - --with-djvu=yes \ - --with-wmf=yes \ - --with-rsvg=yes \ + --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} \ - --with-gcc-arch=no + --without-gcc-arch # 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 @@ -299,7 +310,7 @@ make test %install %{__make} install \ DESTDIR=%{buildroot} \ - pkgdocdir=%{_defaultdocdir}/%{name}-doc/ + pkgdocdir=%{_defaultdocdir}/%{name}/ %perl_process_packlist cd 'Magick++' %{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} @@ -310,8 +321,12 @@ cd .. 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 + +#remove duplicates %if 0%{?suse_version} > 1020 -%fdupes -s %{buildroot}%{_defaultdocdir}/%{name}-doc/www/api +%fdupes -s %{buildroot}%{_defaultdocdir}/%{name} +%fdupes -s %{buildroot}%{_includedir}/%{name}-%{maj} +%fdupes -s %{buildroot}%{_libdir}/pkgconfig %endif %post -n libMagickCore%{libspec}-%{clibver} -p /sbin/ldconfig @@ -329,7 +344,6 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ %files %defattr(-,root,root) %{_bindir}/[^MW]* -%doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE %doc %{_mandir}/man1/* %exclude %{_mandir}/man1/*-config.1.gz @@ -352,12 +366,10 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ %files -n libMagickWand%{libspec}-%{clibver} %defattr(-,root,root) -%doc LICENSE %{_libdir}/libMagickWand*.so.%{clibver}* %files extra %defattr(-,root,root) -%doc LICENSE %{_libdir}/ImageMagick*/modules*/*/wmf.so # don't remove la files, see bnc#579798 %{_libdir}/ImageMagick*/modules*/*/wmf.la @@ -368,7 +380,6 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ %files devel %defattr(-,root,root) -%doc LICENSE %{_libdir}/libMagickCore*.so %{_libdir}/libMagickWand*.so %dir %{_includedir}/ImageMagick* @@ -386,8 +397,7 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ %exclude %{_mandir}/man1/Magick++-config.1.gz %files -n perl-PerlMagick -%defattr(-,root,root) -%doc LICENSE +%defattr(-,root,root,-) %doc PerlMagick/README.txt %doc PerlMagick/demo %doc %{_mandir}/man3/* @@ -399,12 +409,10 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ %files -n libMagick++%{libspec}-%{cxxlibver} %defattr(-,root,root) -%doc LICENSE %{_libdir}/libMagick++*.so.%{cxxlibver}* %files -n libMagick++-devel %defattr(-,root,root) -%doc LICENSE %doc Magick++/demo %doc Magick++/NEWS Magick++/README Magick++/AUTHORS %{_libdir}/libMagick++*.so @@ -417,6 +425,6 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ %files doc %defattr(-,root,root) -%{_docdir}/%{name}-doc +%{_defaultdocdir}/%{name} %changelog From 274034c6f4027ce59728aa7b2dc76008e83dfc2b39084dbb5487f00dccb12323 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 27 Jul 2015 15:08:42 +0000 Subject: [PATCH 2/2] Accepting request 318978 from home:sbrabec:branches:graphics - Update to 6.9.1-10: * New version 6.9.1-10, SVN revision 19269. * coders/magick.c: added "-define h:format=FMT" and "-define magick:format=FMT" options. FMT can be any output format supported by ImageMagick except "H" or "MAGICK". If this define is omitted, the encoder uses GIF by default for pseudoclass images and PNM for directclass images, as previously. Made "MAGICK" (read-write) and "H" (write-only) visible in the format list. * Removed incorrect EOF check in the DDS reader (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28065). * Fixed undefined behaviors (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28067). * Return exception message for unknown image properties. * Color shift removed when reading transparent gray images (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28081) OBS-URL: https://build.opensuse.org/request/show/318978 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=239 --- ImageMagick-6.9.1-10.tar.xz | 3 +++ ImageMagick-6.9.1-10.tar.xz.asc | 17 +++++++++++++++++ ImageMagick-6.9.1-9.tar.xz | 3 --- ImageMagick-6.9.1-9.tar.xz.asc | 17 ----------------- ImageMagick.changes | 19 +++++++++++++++++++ ImageMagick.spec | 2 +- 6 files changed, 40 insertions(+), 21 deletions(-) create mode 100644 ImageMagick-6.9.1-10.tar.xz create mode 100644 ImageMagick-6.9.1-10.tar.xz.asc delete mode 100644 ImageMagick-6.9.1-9.tar.xz delete mode 100644 ImageMagick-6.9.1-9.tar.xz.asc diff --git a/ImageMagick-6.9.1-10.tar.xz b/ImageMagick-6.9.1-10.tar.xz new file mode 100644 index 0000000..8b20ecc --- /dev/null +++ b/ImageMagick-6.9.1-10.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22565464059376513869b6626982e0726a33788ccc7e19a08e55ff1683d4ff92 +size 8287648 diff --git a/ImageMagick-6.9.1-10.tar.xz.asc b/ImageMagick-6.9.1-10.tar.xz.asc new file mode 100644 index 0000000..39a5bf2 --- /dev/null +++ b/ImageMagick-6.9.1-10.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJVs4xSAAoJEImrY9SCdzd6QYAP/iL4996XI4odEnm4Gi5qw+1N +hZ54+Q6ycfhfj454ulpXwzkIHBg/tuO0uj0WBTIh+xTBDXNPS/tmMfXmoomYLSrl +kr2KcRwXcPzdvF9oRzcD8U1SrlddOnwZ7VnHotrC7U/sbr49qZp4LgoHazA10bNi +ngXBjJw0fZ9f5z0ZtULuwSbsjEHrRUi4Zi76b8OMbYsEABXtLJQfxTwFehgK3JF8 +pOo+lj0INt2ZPeY5xllRXBWpWRIFwZxb+hQ8IZYOTiZAoTd3FS9Ach44RtJ/rAu+ ++raWCFEW0xFVvL2S+D2YmFPW4UbLMo2xpyo77NA4XKTusQqw7JTTi9UKlzDpogLg +mkwUzkCl7bEv3MiAznW+BcvpFDmsn1E+Zx6Bxcfr1+0RENtzs21Fx5juYKYyT+w0 +TT6BqeA1IPjH+08pEwJsKkELEP+ukTxelHzoO0LF94Hg9iOSTgGmjiXfrDrJ4Ox7 +FeHJGFUy1otKO8OjL7nBojXIIxImJflsn5PHd/GDusKoSfvaZL0zIJvu+2HXbHBS +qWi1wk06Vw2QjXkG5Z61l0HFa6jw/Mh3Ln196ubD0gTgzm/qO5M39SorMMExqDNa +VoBEY8U8KSa3WLJQPh5c8yR89xTYgs7xIKkPb17fN8rLgGfiunOil8vcGzTjx70O +iCeroFi2YPjqGppBvjpR +=QYDh +-----END PGP SIGNATURE----- diff --git a/ImageMagick-6.9.1-9.tar.xz b/ImageMagick-6.9.1-9.tar.xz deleted file mode 100644 index bc8b6cd..0000000 --- a/ImageMagick-6.9.1-9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83cd785caeb26a171e185b5deba2900c5b73e79c97364caa4c879d26c9f4a91b -size 8285744 diff --git a/ImageMagick-6.9.1-9.tar.xz.asc b/ImageMagick-6.9.1-9.tar.xz.asc deleted file mode 100644 index 0ca7bb6..0000000 --- a/ImageMagick-6.9.1-9.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJVqn81AAoJEImrY9SCdzd6N8UP/1NAgz5zhhE/VAvKQVP35lWK -PUR68/hkQClpv2Uq07TWsj6kQkDYTEySH+4s9tulJRifFoog4oH0WOkGUDpMj6jz -ZjAmnob5lxa4AGSKL5Bjpu1GNr80rqHvardpZcIhTmACQ5GU2tbGb5j0Q2XXlp9I -XrR6EFowsVerB5UTIh+hRCNmujS6DvtfV6red1QBtXoqCqdFG4WBAWy1Tg0kQe8I -1q0cdBSLDu7jvtG4nSHTm/JHOpoQH5uuRwcQ1BBkqQndGegfY5tYKzJNOxYGx6SI -rBZwVL4u7wleRl6lgLkX5mtny2ow24w+tHBobrvCkSW03NVPqgWgGU3fWVIdV4gw -A35j0OqfoxmkSwqmCSw01DEByDjZRhyVjP437E1rTX2l2H00Ptych3ygQ+kU5nza -RcTPycqBW3ATRuw0oXrh6M+2OE1J8yALtVJMLvLnUTS3kLEIUtjB+LKhr2FUCGhU -ecTzBapvH+bSF8E/jWX8HxkLyRZpA96DxnaAe6sED/WHinPC0isH3CztjqySmYWU -dOZSKZyRMzV2nK8QQkwI7yMK931/G5/inN8kObbZMhUEKoEeMVIgXrhLGtnh+P2c -phFf8jt7W/+s0LnyHUtcChEMS79tX9fG+VV1RpgBS0nbAOmoAzYIsIiOWFowtHdZ -+nDQyrmJZNCoJJ55d7T0 -=NIEF ------END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 5a7a656..93e016a 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Jul 27 16:09:52 CEST 2015 - sbrabec@suse.com + +- Update to 6.9.1-10: + * New version 6.9.1-10, SVN revision 19269. + * coders/magick.c: added "-define h:format=FMT" and + "-define magick:format=FMT" options. FMT can be any output format + supported by ImageMagick except "H" or "MAGICK". If this define is + omitted, the encoder uses GIF by default for pseudoclass images and + PNM for directclass images, as previously. Made "MAGICK" (read-write) + and "H" (write-only) visible in the format list. + * Removed incorrect EOF check in the DDS reader (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28065). + * Fixed undefined behaviors (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28067). + * Return exception message for unknown image properties. + * Color shift removed when reading transparent gray images (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28081) + ------------------------------------------------------------------- Thu Jul 23 08:59:31 UTC 2015 - jweberhofer@weberhofer.at diff --git a/ImageMagick.spec b/ImageMagick.spec index eefa94c..cf3d29f 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -63,7 +63,7 @@ BuildRequires: zip %define maj 6 %define mfr_version %{maj}.9.1 -%define mfr_revision 9 +%define mfr_revision 10 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 2