From c9ecc311be042c84bb6e03627b91f47afb293faa75faa922541d6d834c023945 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 31 Mar 2014 08:37:37 +0000 Subject: [PATCH 1/8] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=200 --- ImageMagick-6.8.8-10.tar.xz | 3 +++ ImageMagick-6.8.8-10.tar.xz.asc | 17 +++++++++++++++++ ImageMagick-6.8.8-7.tar.xz | 3 --- ImageMagick-6.8.8-7.tar.xz.asc | 17 ----------------- ImageMagick.spec | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 ImageMagick-6.8.8-10.tar.xz create mode 100644 ImageMagick-6.8.8-10.tar.xz.asc delete mode 100644 ImageMagick-6.8.8-7.tar.xz delete mode 100644 ImageMagick-6.8.8-7.tar.xz.asc diff --git a/ImageMagick-6.8.8-10.tar.xz b/ImageMagick-6.8.8-10.tar.xz new file mode 100644 index 0000000..244db54 --- /dev/null +++ b/ImageMagick-6.8.8-10.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f31c7771ed0b8050837289f0c7b55303172e31acc005b0ee0d120727e2572d33 +size 7530504 diff --git a/ImageMagick-6.8.8-10.tar.xz.asc b/ImageMagick-6.8.8-10.tar.xz.asc new file mode 100644 index 0000000..5bdbcef --- /dev/null +++ b/ImageMagick-6.8.8-10.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJTNfDXAAoJEImrY9SCdzd6/XYP/1fg8L2HbAJmH23uBLoUpiRN +9YxO9X8wMzT85qjQi287AFsbTS9XaNYNR0ri9VAKiPzIhpDsIpjx1N9xfd9dsCpt +e2NsVS5d+sOJ4P++yEKRP4Du7yxwzcY0PSFJJKlQCn7dCEdyZ194bwBfBRSi0Y6+ +sfhsxzuBdVUOoKK4nrVfLCrUXQw3HfjWO8CI7hIaXM1+T09HLN///C755Z7AXVeJ +Mz7BbzGyG5d5yMRgje9vItaL1Fqr+2ap48aaZAbajJtpVglY6jQmZj0Wen5MV74a +DslqhNSpus4YViPkCkMAvHI4mrWoY7fWf0FgkXJx/BP3XlBKdEIGWtGvAVlsw/he +32qMI+vRu9fDtjIAk4J3HTRiWC/BgvocWu4K1rlYdJoArfHNoOSzo8oMuHSc54u0 +0g2owCwlCAZfAgXKrkVqUM+OZl1b2wniO3vtVbSb8SZjYdJfaLQj3LyzWRTXLr07 +G9LQUHTDXz3J1VDWO1QXVn82K449qh9rFwO1PVBKrCLY1w5v1hGSqy0LJg6SBAJy +KBCCLDpt0tCsAvASDCkA4iHRWMvPKSYbX8CPdNJY2iqwRrCcBKa/MoNTfXj7eRGC +grtfQIS7XkV24XUORMAv1sdEHNBcFy5Ms+0uqTiorzxo2W1TlY1h+hfPItebaQVc +OoDdK5r/FZLKGnIf9wvH +=ojLS +-----END PGP SIGNATURE----- diff --git a/ImageMagick-6.8.8-7.tar.xz b/ImageMagick-6.8.8-7.tar.xz deleted file mode 100644 index a995d6b..0000000 --- a/ImageMagick-6.8.8-7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea5753a42329b0c251c753053b66078891a3733f929051f7e9190446f39ab2f4 -size 7448900 diff --git a/ImageMagick-6.8.8-7.tar.xz.asc b/ImageMagick-6.8.8-7.tar.xz.asc deleted file mode 100644 index fa3bb1c..0000000 --- a/ImageMagick-6.8.8-7.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJTAim5AAoJEImrY9SCdzd6pU0P/3N/0Q3GUawzQyKwSmMcplMJ -EBYP3HUNmEf2Vs5tXwumfBfJWMjkWQQ5M0rvmPEPNUSrLN7eBI5ghlxAMuP0kDva -gBuoTGpNMms4N0jvH2CKtv2w9E6jFMR2cafQ2yrS1N0o3qHIrVGSN5G96Z1XvTjn -qjJzA9A7rMg2pDyx4WKOml68Q077iMPkX8EAtqDOOVqV62fR7R8ud02grLfCxkx7 -4ff0qRSA5OE0vniOMnSQAfvPjliAULQ08O/lDI7JwGUEIzYnbrDOFwLcDxSITds6 -FiVCP6ult9L/TnWTfDXRx3iwstv/ds34u1MZrQ30Rrq0bXpNcC6L/MYQYW2fhmxT -MJsM9CcqLunvl0ZDgVotzwVfwyhgdr1lpn6bDY8ohxLLSE81Q7RnRq+ulJMfWHag -VHpkZheCFW8YAi2nDy0ZOFVzXV+2QqGcAtuMkRAt7XefkcX5lH64AFg1sMTHBSdr -yyywyTNXME9o3Lt0GW7Mq8eYRQRv/MwLLoL5NeXS9xu+xEK5HBt7N7K0rwHR9ulg -UHSm+LTVo3cUkwgNFdWIuFqc5FkI7rv7n08rBR/gXXWCyJO9F7iHAHolz0/2HKbd -efOcDufFwA6jvzI5U7LQbXpkJFkni+nBoGzmGj8VWDEJJhWiqU8blmKuY6qGnRBF -9U3g7TIgCNty17wCogCT -=nFNz ------END PGP SIGNATURE----- diff --git a/ImageMagick.spec b/ImageMagick.spec index c329749..0aa18f7 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -49,7 +49,7 @@ BuildRequires: pkgconfig %define maj 6 %define mfr_version %{maj}.8.8 -%define mfr_revision 7 +%define mfr_revision 10 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 2 From 9863dd00cde5028577981e823f0ee8fed4e5e53998076ceef6e9dd8416e852b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 24 Apr 2014 10:29:20 +0000 Subject: [PATCH 2/8] Accepting request 231247 from home:dirkmueller:branches:graphics - remove dependency on gpg-offline (blocks rebuilds and tarball integrity is checked by source-validator anyway) OBS-URL: https://build.opensuse.org/request/show/231247 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=201 --- ImageMagick.changes | 6 ++++++ ImageMagick.spec | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index f57d7f5..b45a8a3 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 24 09:54:12 UTC 2014 - dmueller@suse.com + +- remove dependency on gpg-offline (blocks rebuilds and + tarball integrity is checked by source-validator anyway) + ------------------------------------------------------------------- Mon Mar 3 13:34:39 UTC 2014 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 0aa18f7..b8ab625 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -26,9 +26,6 @@ BuildRequires: gcc-c++ BuildRequires: ghostscript-fonts-other BuildRequires: ghostscript-fonts-std BuildRequires: ghostscript-library -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif BuildRequires: libbz2-devel BuildRequires: libdjvulibre-devel BuildRequires: libexif-devel @@ -230,7 +227,6 @@ support multiple generations of an image in memory at one time. HTML documentation for ImageMagick library and scene examples. %prep -%{?gpg_verify: %gpg_verify %{S:3}} %setup -n ImageMagick-%{source_version} %patch0 %patch1 From 57ffa65c5b0037d55da9c31155fe24dec5b197fd121b9f46a934b203d3db5941 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 27 May 2014 14:02:17 +0000 Subject: [PATCH 3/8] Accepting request 235274 from home:Mailaender:branches:graphics to fix the SLE build properly you will need the project config from my branch, too OBS-URL: https://build.opensuse.org/request/show/235274 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=202 --- ImageMagick.changes | 16 ++++++++++++++++ ImageMagick.spec | 29 +++++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index b45a8a3..f329e62 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sat May 24 11:07:38 UTC 2014 - mailaender@opensuse.org + +- Fixed the SLE build +- Added missing dependencies: + * autotrace + * dejavu-fonts + * fftw3 + * ghostscript + * libjbig + * liblqr + * mupdf + * p7zip + * xdg-utils + * zip + ------------------------------------------------------------------- Thu Apr 24 09:54:12 UTC 2014 - dmueller@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index b8ab625..f1e6aa0 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -18,20 +18,27 @@ Name: ImageMagick +BuildRequires: autotrace-devel BuildRequires: autoconf >= 2.69 BuildRequires: dcraw +%if 0%{?suse_version} >= 1140 +BuildRequires: dejavu-fonts +%endif BuildRequires: fdupes +BuildRequires: fftw3-devel BuildRequires: freetype2-devel BuildRequires: gcc-c++ -BuildRequires: ghostscript-fonts-other -BuildRequires: ghostscript-fonts-std -BuildRequires: ghostscript-library +BuildRequires: ghostscript-devel BuildRequires: libbz2-devel BuildRequires: libdjvulibre-devel BuildRequires: libexif-devel 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 @@ -39,10 +46,19 @@ BuildRequires: libwebp-devel BuildRequires: libwmf-devel BuildRequires: libxml2-devel BuildRequires: lzma-devel +%if 0%{?suse_version} >= 1140 +BuildRequires: mupdf-devel-static BuildRequires: openexr-devel +%endif BuildRequires: openjpeg2-devel +%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}.8.8 @@ -227,7 +243,7 @@ support multiple generations of an image in memory at one time. HTML documentation for ImageMagick library and scene examples. %prep -%setup -n ImageMagick-%{source_version} +%setup -q -n ImageMagick-%{source_version} %patch0 %patch1 %patch2 -p1 @@ -267,6 +283,7 @@ automake make %{?_smp_mflags} all make -j1 perl-build +%if 0%{?suse_version} >= 1140 %check export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs @@ -274,6 +291,7 @@ export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs export MAGICK_CONFIGURE_PATH=$PWD/config cd PerlMagick make test +%endif %install %{__make} install \ @@ -372,6 +390,9 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ %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} %defattr(-,root,root) From ef8970d71445283caa4fee6910d00f5bce86af9c428aeffc575ceca08bcdbe0f Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 27 May 2014 15:38:39 +0000 Subject: [PATCH 4/8] update, so that it can be submitted to factory OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=203 --- ImageMagick-6.8.8-10.tar.xz | 3 --- ImageMagick-6.8.8-10.tar.xz.asc | 17 ----------------- ImageMagick-6.8.9-1.tar.xz | 3 +++ ImageMagick-6.8.9-1.tar.xz.asc | 17 +++++++++++++++++ ImageMagick.changes | 5 +++++ ImageMagick.spec | 12 +++++++----- 6 files changed, 32 insertions(+), 25 deletions(-) delete mode 100644 ImageMagick-6.8.8-10.tar.xz delete mode 100644 ImageMagick-6.8.8-10.tar.xz.asc create mode 100644 ImageMagick-6.8.9-1.tar.xz create mode 100644 ImageMagick-6.8.9-1.tar.xz.asc diff --git a/ImageMagick-6.8.8-10.tar.xz b/ImageMagick-6.8.8-10.tar.xz deleted file mode 100644 index 244db54..0000000 --- a/ImageMagick-6.8.8-10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f31c7771ed0b8050837289f0c7b55303172e31acc005b0ee0d120727e2572d33 -size 7530504 diff --git a/ImageMagick-6.8.8-10.tar.xz.asc b/ImageMagick-6.8.8-10.tar.xz.asc deleted file mode 100644 index 5bdbcef..0000000 --- a/ImageMagick-6.8.8-10.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJTNfDXAAoJEImrY9SCdzd6/XYP/1fg8L2HbAJmH23uBLoUpiRN -9YxO9X8wMzT85qjQi287AFsbTS9XaNYNR0ri9VAKiPzIhpDsIpjx1N9xfd9dsCpt -e2NsVS5d+sOJ4P++yEKRP4Du7yxwzcY0PSFJJKlQCn7dCEdyZ194bwBfBRSi0Y6+ -sfhsxzuBdVUOoKK4nrVfLCrUXQw3HfjWO8CI7hIaXM1+T09HLN///C755Z7AXVeJ -Mz7BbzGyG5d5yMRgje9vItaL1Fqr+2ap48aaZAbajJtpVglY6jQmZj0Wen5MV74a -DslqhNSpus4YViPkCkMAvHI4mrWoY7fWf0FgkXJx/BP3XlBKdEIGWtGvAVlsw/he -32qMI+vRu9fDtjIAk4J3HTRiWC/BgvocWu4K1rlYdJoArfHNoOSzo8oMuHSc54u0 -0g2owCwlCAZfAgXKrkVqUM+OZl1b2wniO3vtVbSb8SZjYdJfaLQj3LyzWRTXLr07 -G9LQUHTDXz3J1VDWO1QXVn82K449qh9rFwO1PVBKrCLY1w5v1hGSqy0LJg6SBAJy -KBCCLDpt0tCsAvASDCkA4iHRWMvPKSYbX8CPdNJY2iqwRrCcBKa/MoNTfXj7eRGC -grtfQIS7XkV24XUORMAv1sdEHNBcFy5Ms+0uqTiorzxo2W1TlY1h+hfPItebaQVc -OoDdK5r/FZLKGnIf9wvH -=ojLS ------END PGP SIGNATURE----- diff --git a/ImageMagick-6.8.9-1.tar.xz b/ImageMagick-6.8.9-1.tar.xz new file mode 100644 index 0000000..1207d6b --- /dev/null +++ b/ImageMagick-6.8.9-1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88e9f72cff22b91738494abe8b87f53c5b0c6932c4b08f944bf79846f035e642 +size 7539420 diff --git a/ImageMagick-6.8.9-1.tar.xz.asc b/ImageMagick-6.8.9-1.tar.xz.asc new file mode 100644 index 0000000..89c6a37 --- /dev/null +++ b/ImageMagick-6.8.9-1.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJTbWowAAoJEImrY9SCdzd6CNkQALClSuWqp+dF2biVqcYkMN7u +Pl2G16WG978aG9lHjSjZFql/d9kTvhVXMRkXeirYh5YcmNgTylOBRD5ms3LHLpwM +aCGBurDWrikExNFkgTlnOufeIA20eXWOWyph3Ih1C67u7I9zvsqYjT1xoeZe/+VD +OmNFexpcn3XstzUBFo5pQNumFreb05LN7l8o2M5xL9e4wqxswN0Yt4tZpG14Shou +KSWYW8SWZDSNJWa/34llHjqln+dilTQiQlMuuHatVHb/h/rFlEKLfl80AbMjk6LL +qoC+Ms9fgOYu9KdLCw2sOnc8k1lQrXLb9ZdpDFbtd1+O56dyukhVW0evI77XThLZ +KV77sGwlFVhq2JetRzZa8uGV2oqBl4pHHVhXiRzHaCfRANBuaIqxaFQfSb7og29Y +h72Ek1xY68kzNaLc5xGKWtjk3OVeUtdptgQeaz6VeR/0a3QB9w/MO+Td8N59KMq0 +yTyxKrf7QBgBTT638S0vUo7VYzVZfTFeg9pNco2SStqOb3LYRfRsESXrIyozS4v+ +/lO4CqU0TriGeDzN1jQSy60+OAp+3PlPtUn5Iv27fRJ86+Tyy6SmXRDIIvUYTb00 +0jP6CRz9D8DrWk+GpFhGhxtTouYLQ/jh3feKfHZ2+0AKMFObDiiBM26/uBBMIG4x +8o9/XVY29SEXx/Pe2gio +=ZRN8 +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index f329e62..e5ed35a 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 27 14:56:39 UTC 2014 - opensuse@dstoecker.de + +- update to 6.8.9 + ------------------------------------------------------------------- Sat May 24 11:07:38 UTC 2014 - mailaender@opensuse.org diff --git a/ImageMagick.spec b/ImageMagick.spec index f1e6aa0..0efdc51 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -18,8 +18,8 @@ Name: ImageMagick -BuildRequires: autotrace-devel BuildRequires: autoconf >= 2.69 +BuildRequires: autotrace-devel BuildRequires: dcraw %if 0%{?suse_version} >= 1140 BuildRequires: dejavu-fonts @@ -46,11 +46,13 @@ BuildRequires: libwebp-devel BuildRequires: libwmf-devel BuildRequires: libxml2-devel BuildRequires: lzma-devel -%if 0%{?suse_version} >= 1140 +%if 0%{?suse_version} >= 1310 BuildRequires: mupdf-devel-static +%endif +%if 0%{?suse_version} >= 1140 BuildRequires: openexr-devel %endif -BuildRequires: openjpeg2-devel +BuildRequires: openjpeg2-devel >= 2.1.0 %if 0%{?suse_version} >= 1140 BuildRequires: p7zip %endif @@ -61,8 +63,8 @@ BuildRequires: xz BuildRequires: zip %define maj 6 -%define mfr_version %{maj}.8.8 -%define mfr_revision 10 +%define mfr_version %{maj}.8.9 +%define mfr_revision 1 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 2 From 571f3d91e0348946346c180c7a34819256b1ce525f8c6861dd0d8177c5f1f6ad Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Sat, 31 May 2014 08:40:12 +0000 Subject: [PATCH 5/8] Accepting request 235908 from home:coolo:branches:openSUSE:Factory - remove autotrace dependency again - it's not compiled in and autotrace's last release is 10 years old and we don't want to promote it, better drop it * Fixed bug with the PNG00 subformat when the original format was PNG32. * The "-strip" option now only removes profiles and comments from PNG output. Previously the background, density, and other metadata were also discarded. * Support new -hough-lines option. * Support new -mean-shift option. * identify -units without argument no longer faults (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25542). * Require OpenJP2 version 2.1.0 (opj_stream_set_user_data() method signature change between 2.0.0 and 2.1.0). OBS-URL: https://build.opensuse.org/request/show/235908 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=204 --- ImageMagick.changes | 17 +++++++++++++++++ ImageMagick.spec | 1 - 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index e5ed35a..125afc7 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,7 +1,24 @@ +------------------------------------------------------------------- +Sat May 31 07:10:06 UTC 2014 - coolo@suse.com + +- remove autotrace dependency again - it's not compiled in and + autotrace's last release is 10 years old and we don't want to + promote it, better drop it + ------------------------------------------------------------------- Tue May 27 14:56:39 UTC 2014 - opensuse@dstoecker.de - update to 6.8.9 + * Fixed bug with the PNG00 subformat when the original format was PNG32. + * The "-strip" option now only removes profiles and comments from PNG + output. Previously the background, density, and other metadata were + also discarded. + * Support new -hough-lines option. + * Support new -mean-shift option. + * identify -units without argument no longer faults (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25542). + * Require OpenJP2 version 2.1.0 (opj_stream_set_user_data() method signature + change between 2.0.0 and 2.1.0). ------------------------------------------------------------------- Sat May 24 11:07:38 UTC 2014 - mailaender@opensuse.org diff --git a/ImageMagick.spec b/ImageMagick.spec index 0efdc51..7f35249 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -19,7 +19,6 @@ Name: ImageMagick BuildRequires: autoconf >= 2.69 -BuildRequires: autotrace-devel BuildRequires: dcraw %if 0%{?suse_version} >= 1140 BuildRequires: dejavu-fonts From ba8955798c3940485b4d87e73cd8f19b963d3145ddb6a8c52223cbd0426cfe80 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Sat, 31 May 2014 09:31:47 +0000 Subject: [PATCH 6/8] update again OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=205 --- ImageMagick-6.7.6.1-no-dist-lzip.patch | 4 ++-- ImageMagick-6.8.9-1.tar.xz | 3 --- ImageMagick-6.8.9-1.tar.xz.asc | 17 ---------------- ImageMagick-6.8.9-2.tar.xz | 3 +++ ImageMagick-6.8.9-2.tar.xz.asc | 17 ++++++++++++++++ ImageMagick.changes | 28 ++++++++++++++++++++++++++ ImageMagick.spec | 4 ++-- 7 files changed, 52 insertions(+), 24 deletions(-) delete mode 100644 ImageMagick-6.8.9-1.tar.xz delete mode 100644 ImageMagick-6.8.9-1.tar.xz.asc create mode 100644 ImageMagick-6.8.9-2.tar.xz create mode 100644 ImageMagick-6.8.9-2.tar.xz.asc diff --git a/ImageMagick-6.7.6.1-no-dist-lzip.patch b/ImageMagick-6.7.6.1-no-dist-lzip.patch index 1204eb3..0da003a 100644 --- a/ImageMagick-6.7.6.1-no-dist-lzip.patch +++ b/ImageMagick-6.7.6.1-no-dist-lzip.patch @@ -6,8 +6,8 @@ Index: ImageMagick-6.7.6-1/configure.ac # Ensure that make can run correctly AM_SANITY_CHECK --AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip]) -+AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-xz dist-zip]) +-AM_INIT_AUTOMAKE([1.12 nostdinc color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip]) ++AM_INIT_AUTOMAKE([1.12 nostdinc color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-xz dist-zip]) # Enable support for silent build rules m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) diff --git a/ImageMagick-6.8.9-1.tar.xz b/ImageMagick-6.8.9-1.tar.xz deleted file mode 100644 index 1207d6b..0000000 --- a/ImageMagick-6.8.9-1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88e9f72cff22b91738494abe8b87f53c5b0c6932c4b08f944bf79846f035e642 -size 7539420 diff --git a/ImageMagick-6.8.9-1.tar.xz.asc b/ImageMagick-6.8.9-1.tar.xz.asc deleted file mode 100644 index 89c6a37..0000000 --- a/ImageMagick-6.8.9-1.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJTbWowAAoJEImrY9SCdzd6CNkQALClSuWqp+dF2biVqcYkMN7u -Pl2G16WG978aG9lHjSjZFql/d9kTvhVXMRkXeirYh5YcmNgTylOBRD5ms3LHLpwM -aCGBurDWrikExNFkgTlnOufeIA20eXWOWyph3Ih1C67u7I9zvsqYjT1xoeZe/+VD -OmNFexpcn3XstzUBFo5pQNumFreb05LN7l8o2M5xL9e4wqxswN0Yt4tZpG14Shou -KSWYW8SWZDSNJWa/34llHjqln+dilTQiQlMuuHatVHb/h/rFlEKLfl80AbMjk6LL -qoC+Ms9fgOYu9KdLCw2sOnc8k1lQrXLb9ZdpDFbtd1+O56dyukhVW0evI77XThLZ -KV77sGwlFVhq2JetRzZa8uGV2oqBl4pHHVhXiRzHaCfRANBuaIqxaFQfSb7og29Y -h72Ek1xY68kzNaLc5xGKWtjk3OVeUtdptgQeaz6VeR/0a3QB9w/MO+Td8N59KMq0 -yTyxKrf7QBgBTT638S0vUo7VYzVZfTFeg9pNco2SStqOb3LYRfRsESXrIyozS4v+ -/lO4CqU0TriGeDzN1jQSy60+OAp+3PlPtUn5Iv27fRJ86+Tyy6SmXRDIIvUYTb00 -0jP6CRz9D8DrWk+GpFhGhxtTouYLQ/jh3feKfHZ2+0AKMFObDiiBM26/uBBMIG4x -8o9/XVY29SEXx/Pe2gio -=ZRN8 ------END PGP SIGNATURE----- diff --git a/ImageMagick-6.8.9-2.tar.xz b/ImageMagick-6.8.9-2.tar.xz new file mode 100644 index 0000000..2e3cb34 --- /dev/null +++ b/ImageMagick-6.8.9-2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da6add096ef93b2d467a5e71cbcca8a885ff3ee948f31845144130679db7850e +size 7548932 diff --git a/ImageMagick-6.8.9-2.tar.xz.asc b/ImageMagick-6.8.9-2.tar.xz.asc new file mode 100644 index 0000000..c390212 --- /dev/null +++ b/ImageMagick-6.8.9-2.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJTiQuDAAoJEImrY9SCdzd6eOUP+gJwaul/HNwiNkLILkUJS6G1 +yLZsYir6NtNCS/q3t7wXjNW3LgVpMVebmF3c8iTAyyeYpfisg7s0LIWoyaq8Hdjh +Or9p+ErIUvJ+AvCiZaGk9y0dTBWRNVvGMQ5/0jbyjZZeI2u23Qd4IWL2bLmGyWkT +JM2lsQqa5aRdjcuZlKZhiydExE4CTCEH7S7WfTELkVrE9VNd33C5wzq/zhaKOQAX +/9mulcDq9LD/tQPzI3TTmkc+T6h3Aq8sRaswEdemQ1+XAXbzwpl04i1ge8YZ/VFR +8huBRqUcCVVheSBE0n2x3c71m+Mq51nh+3dwr2XwhasTiuc4XXQnXjEdM+2vtn2L +xKiSLXGuT7C0ZXjT8Re6m2o+wNVovJLzn2V5+u7d3U0Czp2cLCPqk52udR4GwI6A +XtFi6zs86yb0rAtUDvo1Bb/9P4YupKZo04M5G7XcZacHo47UpNVAf1EQoGhSPANO +dTyn8I534cmwUw4HdwN1NDQ+9SrHT3SFYku6cCJ/TgJE8001/jGMW1YPeLgxMxRx +GUVk/kYa7gC7G+M8krbx6noQzcTqkajTF8kZYrWg0f9Nh4Zlipknac3heuQMrPWI +UH80graLiBSYchf3cnNq4TSVL2U9JNMUmD+QNM6A59V5s3LGJbM6IrJUUT/C30OU +RXiMMuogs9lExSiJac3Y +=IC8s +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 125afc7..d8d225e 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Sat May 31 08:44:29 UTC 2014 - opensuse@dstoecker.de + +- update to 6.8.9-2 + * Fixed some bugs in the PNG codec discovered by coverity analysis. + * The -fx equality operator returns a proper boolean result now (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25580). + * Permit spaces in the gradient color specification (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25614). + * Fix IdentifyImage() crash when image->magick member is null (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25615). + * The -format M and Y channels are no longer reversed (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25633). + * Remove Makefile race condition where two targets attempt to install + magick-baseconfig.h (reference + http://git.buildroot.net/buildroot/commit/?id=7395ee9d3b88e45798143e05a28d6d4b51409130) + * Fix memory leak in BlobToStringInfo() (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25639). + * In certain cases, -adaptive-sharpen failed to sharpen (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23211 + * Bump major Magick++ library version. + * Added support for writing RLE compressed TGA files (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=12335). + * Improved performance of parsing the xmp profile (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25612). + * Fixed detecting transparency in PSD files (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25634). + ------------------------------------------------------------------- Sat May 31 07:10:06 UTC 2014 - coolo@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 7f35249..066e35c 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -63,11 +63,11 @@ BuildRequires: zip %define maj 6 %define mfr_version %{maj}.8.9 -%define mfr_revision 1 +%define mfr_revision 2 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 2 -%define cxxlibver 3 +%define cxxlibver 4 %define libspec -%{maj}_Q%{quantum_depth} Version: %{mfr_version}.%{mfr_revision} Release: 0 From a71196958bfff48ce5c9f81a34ecdf6167aeb07d4f5ec7964de4d04a889a7bbb Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Sat, 31 May 2014 09:33:26 +0000 Subject: [PATCH 7/8] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=206 --- ImageMagick.changes | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index d8d225e..c093523 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -3,28 +3,18 @@ Sat May 31 08:44:29 UTC 2014 - opensuse@dstoecker.de - update to 6.8.9-2 * Fixed some bugs in the PNG codec discovered by coverity analysis. - * The -fx equality operator returns a proper boolean result now (reference - http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25580). - * Permit spaces in the gradient color specification (reference - http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25614). - * Fix IdentifyImage() crash when image->magick member is null (reference - http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25615). - * The -format M and Y channels are no longer reversed (reference - http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25633). + * The -fx equality operator returns a proper boolean result now. + * Permit spaces in the gradient color specification. + * Fix IdentifyImage() crash when image->magick member is null. + * The -format M and Y channels are no longer reversed. * Remove Makefile race condition where two targets attempt to install - magick-baseconfig.h (reference - http://git.buildroot.net/buildroot/commit/?id=7395ee9d3b88e45798143e05a28d6d4b51409130) - * Fix memory leak in BlobToStringInfo() (reference - http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25639). - * In certain cases, -adaptive-sharpen failed to sharpen (reference - http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23211 + magick-baseconfig.h + * Fix memory leak in BlobToStringInfo(). + * In certain cases, -adaptive-sharpen failed to sharpen * Bump major Magick++ library version. - * Added support for writing RLE compressed TGA files (reference - http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=12335). - * Improved performance of parsing the xmp profile (reference - http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25612). - * Fixed detecting transparency in PSD files (reference - http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25634). + * Added support for writing RLE compressed TGA files. + * Improved performance of parsing the xmp profile. + * Fixed detecting transparency in PSD files. ------------------------------------------------------------------- Sat May 31 07:10:06 UTC 2014 - coolo@suse.com From 67fa722692587d09079caa40b60e56af56bad8010bb885c759f700cf25222c96 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 10 Jun 2014 13:07:12 +0000 Subject: [PATCH 8/8] update OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=207 --- ImageMagick-6.8.9-2.tar.xz | 3 --- ImageMagick-6.8.9-2.tar.xz.asc | 17 ----------------- ImageMagick-6.8.9-3.tar.xz | 3 +++ ImageMagick-6.8.9-3.tar.xz.asc | 17 +++++++++++++++++ ImageMagick.changes | 10 ++++++++++ ImageMagick.spec | 2 +- 6 files changed, 31 insertions(+), 21 deletions(-) delete mode 100644 ImageMagick-6.8.9-2.tar.xz delete mode 100644 ImageMagick-6.8.9-2.tar.xz.asc create mode 100644 ImageMagick-6.8.9-3.tar.xz create mode 100644 ImageMagick-6.8.9-3.tar.xz.asc diff --git a/ImageMagick-6.8.9-2.tar.xz b/ImageMagick-6.8.9-2.tar.xz deleted file mode 100644 index 2e3cb34..0000000 --- a/ImageMagick-6.8.9-2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da6add096ef93b2d467a5e71cbcca8a885ff3ee948f31845144130679db7850e -size 7548932 diff --git a/ImageMagick-6.8.9-2.tar.xz.asc b/ImageMagick-6.8.9-2.tar.xz.asc deleted file mode 100644 index c390212..0000000 --- a/ImageMagick-6.8.9-2.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJTiQuDAAoJEImrY9SCdzd6eOUP+gJwaul/HNwiNkLILkUJS6G1 -yLZsYir6NtNCS/q3t7wXjNW3LgVpMVebmF3c8iTAyyeYpfisg7s0LIWoyaq8Hdjh -Or9p+ErIUvJ+AvCiZaGk9y0dTBWRNVvGMQ5/0jbyjZZeI2u23Qd4IWL2bLmGyWkT -JM2lsQqa5aRdjcuZlKZhiydExE4CTCEH7S7WfTELkVrE9VNd33C5wzq/zhaKOQAX -/9mulcDq9LD/tQPzI3TTmkc+T6h3Aq8sRaswEdemQ1+XAXbzwpl04i1ge8YZ/VFR -8huBRqUcCVVheSBE0n2x3c71m+Mq51nh+3dwr2XwhasTiuc4XXQnXjEdM+2vtn2L -xKiSLXGuT7C0ZXjT8Re6m2o+wNVovJLzn2V5+u7d3U0Czp2cLCPqk52udR4GwI6A -XtFi6zs86yb0rAtUDvo1Bb/9P4YupKZo04M5G7XcZacHo47UpNVAf1EQoGhSPANO -dTyn8I534cmwUw4HdwN1NDQ+9SrHT3SFYku6cCJ/TgJE8001/jGMW1YPeLgxMxRx -GUVk/kYa7gC7G+M8krbx6noQzcTqkajTF8kZYrWg0f9Nh4Zlipknac3heuQMrPWI -UH80graLiBSYchf3cnNq4TSVL2U9JNMUmD+QNM6A59V5s3LGJbM6IrJUUT/C30OU -RXiMMuogs9lExSiJac3Y -=IC8s ------END PGP SIGNATURE----- diff --git a/ImageMagick-6.8.9-3.tar.xz b/ImageMagick-6.8.9-3.tar.xz new file mode 100644 index 0000000..8278e44 --- /dev/null +++ b/ImageMagick-6.8.9-3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aca0c1af5b2db84a39dcb7ac109be542965af61ebab967c84d26541f475ba9d1 +size 7555684 diff --git a/ImageMagick-6.8.9-3.tar.xz.asc b/ImageMagick-6.8.9-3.tar.xz.asc new file mode 100644 index 0000000..1281eed --- /dev/null +++ b/ImageMagick-6.8.9-3.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJTlJZqAAoJEImrY9SCdzd6vx4P/1WQlXpaJ7XP0drtAWS3Y47I +FQgzTqDoh6kRCG2j8CkjbJsupOlIt9DdxKPIsief8MTSvzSFfqV4lZT4r+xBsMpJ +1vyqChE3I/4j87zOhCrnM0EMRwfTpXXv0h8SC3QpUs+j82NqCDd2FYfoCwDX2Qzr +1MOssMUbaVSnDBbRtToFdbcEdt3nB+EMyT3GIG7vIcOxZxAtHAL7cULL3cwnpVtd +d01PH8FUrernJsizaw3De0fElWV1Z2TrWx4ocOEqAN4mMeT/dMzF+Qoxt2asWL7S +WN20itSdr3kO/U0sBHngfVQKXLlhn451inhiKtUCCN3k9ovO2sS4HAt53MCjjqST +pHjehtlLqrMac4p3mNjhDgizlWzUgoKBoIopCxJ8/z2akSZxgudn6rzKxzOa7V6i +wjx/zcsYaYjITUenwS7XxPRvNsER+NHemzv781MCz3EFp0WqrEt0UbTCEO+YnIKD +D4jFlv8tza2AS04eCRCeIJae0su8uKCxqegxw1YC1PUMch/S3pQFa21MvLRziXaz +SLOI6ATV+HIi7AuHXiT4GU7pzeuGH9icAHL/HBE+fmKcywIEoQanVXEF5KXPQS1I +dvS6LwgAgYZn15iVlWw7ixURTiRZ5fXwVDVEE3xAPu180CdN53TOEkjC2/W0Ibjf +IUvvJG+qCe7IfuCeHQIz +=M1nE +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index c093523..94b90ef 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jun 10 12:46:22 UTC 2014 - opensuse@dstoecker.de + +- update to 6.8.9-3 + * Quiet warning about unused variable "skip_to_iend" in coders/png.c. + * Fixed creation of SVG from 8bim clip path. + * The -version option returns 0 status + * The inline coder can now read from standard input + * Add '=' character to the santize whitelist. + ------------------------------------------------------------------- Sat May 31 08:44:29 UTC 2014 - opensuse@dstoecker.de diff --git a/ImageMagick.spec b/ImageMagick.spec index 066e35c..3c462a6 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -63,7 +63,7 @@ BuildRequires: zip %define maj 6 %define mfr_version %{maj}.8.9 -%define mfr_revision 2 +%define mfr_revision 3 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 2