From c46dbdc34e20f471acb9f9bc9547b4fe46025bf8ba096fcf47683c449889bc9e Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 18 Feb 2014 07:33:00 +0000 Subject: [PATCH 01/13] - updated to 6.8.8-6: * build against openjpeg2 * identify -define identify:locate=maximum locates the position of the maximum value * Fix case where an image moment might have a mass of 0 or a Hu moment might be 0. * Enhance the TXT coder to read RGB percent values, e.g. 10.008%. * etc. see ChangeLog OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=183 --- ImageMagick-6.8.8-1.tar.xz | 3 --- ImageMagick-6.8.8-1.tar.xz.asc | 17 ----------------- ImageMagick-6.8.8-6.tar.xz | 3 +++ ImageMagick-6.8.8-6.tar.xz.asc | 17 +++++++++++++++++ ImageMagick.changes | 12 ++++++++++++ ImageMagick.spec | 13 +++++++++++-- 6 files changed, 43 insertions(+), 22 deletions(-) delete mode 100644 ImageMagick-6.8.8-1.tar.xz delete mode 100644 ImageMagick-6.8.8-1.tar.xz.asc create mode 100644 ImageMagick-6.8.8-6.tar.xz create mode 100644 ImageMagick-6.8.8-6.tar.xz.asc diff --git a/ImageMagick-6.8.8-1.tar.xz b/ImageMagick-6.8.8-1.tar.xz deleted file mode 100644 index 22bbbd6..0000000 --- a/ImageMagick-6.8.8-1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ce766720e07c61a9993c3c226425d8b1b7a18fd8ffb1841c2380a7d622c107b -size 7527812 diff --git a/ImageMagick-6.8.8-1.tar.xz.asc b/ImageMagick-6.8.8-1.tar.xz.asc deleted file mode 100644 index e3ffc28..0000000 --- a/ImageMagick-6.8.8-1.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJSwYBnAAoJEImrY9SCdzd6wBUQAI0Xa27kNqht69qgevKr38u7 -11BvBv8hOgG57tPQzuR5vhssb70drVrRKV2ltGHm76yLAkLbK0SEhbBPb3rGCKIr -xJfI3mMzkZ9t4QSyxnSYZBmgG6vRjsSugynYEqexrOQDtTbA8eQCvSeXBKSe8DiQ -p/yeozhAIWEAjx1/LImvJ93X0lyVWiIgzaUMmK6P6idMtM3vCrdve4XH6Q3h4HDs -XZsDVVi7HKgCYKhiumVDLfYaUuDkOBtudQivlulvPXNO6TpVxc2raZs5aTMHWuVU -FjXGZpZV0ZT+DGVUG/0URbX6Xl3bQDek9VI7LHe2uUaOQUfjMS70Ahwnf2j/NaXX -6TCeqnQT2ZiNKNsC8ulxyKV6hmNKvdIC3KAau3wV7liorRjtSWnxOGC1EnXFHVeC -2YQrTxbDqKQOqT288kXr7V+fyP2pvFkHveKyKeCorezsbHBkQuXHwHM+PQFHDySm -HCeQ48/X4QJqV527hUzEyHBrYVda8/lgDVCs10qIUnoIv/PteFFKDno+QZ3+pzIi -VRlT9cc70aak7rDI6lYUoRkuzLStPJR0E4Ddrx9noTW8rlJ+fBcLoJT/8ifBeJVx -Tc8ewtRti5ot518pnTfu28EUb+tPmxazCTcH3sOBFVlIZ0S5WJaNx1wp4l/w0Hcc -4OganUQ47rFSoKpyTDNL -=VjWH ------END PGP SIGNATURE----- diff --git a/ImageMagick-6.8.8-6.tar.xz b/ImageMagick-6.8.8-6.tar.xz new file mode 100644 index 0000000..64c9b3c --- /dev/null +++ b/ImageMagick-6.8.8-6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bb7d480203ef124595f80426f1bfc79403150600592f24deb9c94f3b3ba1903 +size 7449952 diff --git a/ImageMagick-6.8.8-6.tar.xz.asc b/ImageMagick-6.8.8-6.tar.xz.asc new file mode 100644 index 0000000..2d71de5 --- /dev/null +++ b/ImageMagick-6.8.8-6.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJS/WwOAAoJEImrY9SCdzd6AUsP/jLywgSswfhQcKenJDCGkvgk +pWCKUzYNU8x68s0iLyHazLTcFut9GLtNy6hMO2bcrjGEw2Voz0buKdUoBXjLIjys +pBGJzl2qcRF9qcp9NfWWLeHnxMYs/8hRX8bDcTDpcRYxmJ2EnJipFjky6Y/tpm/c +30EXHMtsKzzFOMYKZVwE929by/fMsKQ4RZCaHam3Jq1+xn3UsmOI2y2YNFpGLnyO +x+Sx0FbzzJgBViUEzAIoFNS1ByP0igzL8j52ssUXe5OOILFUVCOIaO2Q7+YoX4aL +hR/5dnnvdMrakfQ0zFJwYEPHZPSWPjGgGlccakHXPqvCyy8wXRZkA/aa6zUKuRat +DnuldC2ft6xKKleGKgTXQSRqx0sIalugju3VDxFwc7MXpY/qFAMK6/P2LmrBq7nK +8MLroCrOkbpSVYT6lbrNoEL0VqpWTP4AKh54d7BNKdxRkmhiZzS3B1MfoGxmF6u2 +Y3LKRH52krKmQXOE8Pml37OaglTD9e08zZ4id796Ju69g0LY2kGfuXvAcjXdMbyg +pwBiGHdQpOH0M6EMv8lv0UCsG5caDS6AQkwucNz8MNoc2JenuB3+ALh5lUkUxvBL +UwO36cQmOZF+9iXN73LTxerCvIK5K1CV7jdXHmOcVOYJ9+mCFSik6otRixqYz4Hl +gQabNRJjJR5tpRwH5RxN +=ArXe +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 27bb4d6..ec3a790 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Feb 18 07:28:51 UTC 2014 - pgajdos@suse.com + +- updated to 6.8.8-6: + * build against openjpeg2 + * identify -define identify:locate=maximum locates the position of the + maximum value + * Fix case where an image moment might have a mass of 0 or a Hu moment might + be 0. + * Enhance the TXT coder to read RGB percent values, e.g. 10.008%. + * etc. see ChangeLog + ------------------------------------------------------------------- Thu Feb 13 14:03:12 UTC 2014 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 0df3afd..ca3f4dc 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -43,14 +43,15 @@ BuildRequires: libwmf-devel BuildRequires: libxml2-devel BuildRequires: lzma-devel BuildRequires: openexr-devel +BuildRequires: openjpeg2-devel BuildRequires: pango-devel BuildRequires: pkgconfig %define mfr_version 6.8.8 -%define mfr_revision 1 +%define mfr_revision 6 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} -%define clibver 1 +%define clibver 2 %define cxxlibver 3 %define libspec -6_Q%{quantum_depth} Version: %{mfr_version}.%{mfr_revision} @@ -407,6 +408,14 @@ HTML documentation for ImageMagick library and scene examples. + + + + + + + + %changelog From 7d713ecf0094219ee26d6a4a13565f7dccc8e151e1293b0e6000de54a3e7ebc3 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:01:59 +0000 Subject: [PATCH 02/13] Accepting request 223973 from home:Andreas_Schwab:Factory - Apply disable_mat_test.patch also on m68k OBS-URL: https://build.opensuse.org/request/show/223973 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=184 --- ImageMagick.changes | 5 +++++ ImageMagick.spec | 22 +--------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index ec3a790..a12a90f 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 26 15:59:07 UTC 2014 - schwab@suse.de + +- Apply disable_mat_test.patch also on m68k + ------------------------------------------------------------------- Tue Feb 18 07:28:51 UTC 2014 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index ca3f4dc..9b8608d 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -143,7 +143,7 @@ BuildArch: noarch %patch3 -p1 %patch4 -p1 %patch11 -p1 -%ifarch ppc ppc64 s390 s390x +%ifarch ppc ppc64 s390 s390x m68k %patch12 %endif @@ -397,25 +397,5 @@ support multiple generations of an image in memory at one time. %description doc HTML documentation for ImageMagick library and scene examples. - - - - - - - - - - - - - - - - - - - - %changelog From 0b4f27d49c5f912bd48a69646f516e32c32228375fb3add4209dc7f2525ddc0d Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:14:04 +0000 Subject: [PATCH 03/13] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=185 --- ImageMagick.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 9b8608d..6281a5d 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -48,7 +48,7 @@ BuildRequires: pango-devel BuildRequires: pkgconfig %define mfr_version 6.8.8 -%define mfr_revision 6 +%define mfr_revision 7 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 2 From 3ab2fee8f731f6e4a3b8450c32269719f5a28fb65633eb835cd32debed11d8bf Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:15:21 +0000 Subject: [PATCH 04/13] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=186 --- _service | 7 +++++++ _service:download_url:ImageMagick-6.8.8-7.tar.xz | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 _service create mode 100644 _service:download_url:ImageMagick-6.8.8-7.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..e439319 --- /dev/null +++ b/_service @@ -0,0 +1,7 @@ + + + www.imagemagick.org + http + /download/ImageMagick-6.8.8-7.tar.xz + + \ No newline at end of file diff --git a/_service:download_url:ImageMagick-6.8.8-7.tar.xz b/_service:download_url:ImageMagick-6.8.8-7.tar.xz new file mode 100644 index 0000000..a995d6b --- /dev/null +++ b/_service:download_url:ImageMagick-6.8.8-7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea5753a42329b0c251c753053b66078891a3733f929051f7e9190446f39ab2f4 +size 7448900 From 40e4b6cf6f9b1c4fcbddb547e7399193806078f1cae609ed9e43f24b57a2386a Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:15:48 +0000 Subject: [PATCH 05/13] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=188 --- _service | 7 ------- _service:download_url:ImageMagick-6.8.8-7.tar.xz | 3 --- 2 files changed, 10 deletions(-) delete mode 100644 _service delete mode 100644 _service:download_url:ImageMagick-6.8.8-7.tar.xz diff --git a/_service b/_service deleted file mode 100644 index e439319..0000000 --- a/_service +++ /dev/null @@ -1,7 +0,0 @@ - - - www.imagemagick.org - http - /download/ImageMagick-6.8.8-7.tar.xz - - \ No newline at end of file diff --git a/_service:download_url:ImageMagick-6.8.8-7.tar.xz b/_service:download_url:ImageMagick-6.8.8-7.tar.xz deleted file mode 100644 index a995d6b..0000000 --- a/_service:download_url: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 From 9bb64009230902327429dae6775744bc2163aa6b9648a7bf6af0d576575ae88e Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:20:12 +0000 Subject: [PATCH 06/13] update to 6.8.8-7 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=189 --- ImageMagick-6.8.8-6.tar.xz | 3 --- ImageMagick-6.8.8-6.tar.xz.asc | 17 ----------------- ImageMagick-6.8.8-7.tar.xz | 3 +++ ImageMagick-6.8.8-7.tar.xz.asc | 17 +++++++++++++++++ ImageMagick.changes | 5 +++++ ImageMagick.spec | 3 +++ 6 files changed, 28 insertions(+), 20 deletions(-) delete mode 100644 ImageMagick-6.8.8-6.tar.xz delete mode 100644 ImageMagick-6.8.8-6.tar.xz.asc create mode 100644 ImageMagick-6.8.8-7.tar.xz create mode 100644 ImageMagick-6.8.8-7.tar.xz.asc diff --git a/ImageMagick-6.8.8-6.tar.xz b/ImageMagick-6.8.8-6.tar.xz deleted file mode 100644 index 64c9b3c..0000000 --- a/ImageMagick-6.8.8-6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5bb7d480203ef124595f80426f1bfc79403150600592f24deb9c94f3b3ba1903 -size 7449952 diff --git a/ImageMagick-6.8.8-6.tar.xz.asc b/ImageMagick-6.8.8-6.tar.xz.asc deleted file mode 100644 index 2d71de5..0000000 --- a/ImageMagick-6.8.8-6.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJS/WwOAAoJEImrY9SCdzd6AUsP/jLywgSswfhQcKenJDCGkvgk -pWCKUzYNU8x68s0iLyHazLTcFut9GLtNy6hMO2bcrjGEw2Voz0buKdUoBXjLIjys -pBGJzl2qcRF9qcp9NfWWLeHnxMYs/8hRX8bDcTDpcRYxmJ2EnJipFjky6Y/tpm/c -30EXHMtsKzzFOMYKZVwE929by/fMsKQ4RZCaHam3Jq1+xn3UsmOI2y2YNFpGLnyO -x+Sx0FbzzJgBViUEzAIoFNS1ByP0igzL8j52ssUXe5OOILFUVCOIaO2Q7+YoX4aL -hR/5dnnvdMrakfQ0zFJwYEPHZPSWPjGgGlccakHXPqvCyy8wXRZkA/aa6zUKuRat -DnuldC2ft6xKKleGKgTXQSRqx0sIalugju3VDxFwc7MXpY/qFAMK6/P2LmrBq7nK -8MLroCrOkbpSVYT6lbrNoEL0VqpWTP4AKh54d7BNKdxRkmhiZzS3B1MfoGxmF6u2 -Y3LKRH52krKmQXOE8Pml37OaglTD9e08zZ4id796Ju69g0LY2kGfuXvAcjXdMbyg -pwBiGHdQpOH0M6EMv8lv0UCsG5caDS6AQkwucNz8MNoc2JenuB3+ALh5lUkUxvBL -UwO36cQmOZF+9iXN73LTxerCvIK5K1CV7jdXHmOcVOYJ9+mCFSik6otRixqYz4Hl -gQabNRJjJR5tpRwH5RxN -=ArXe ------END PGP SIGNATURE----- diff --git a/ImageMagick-6.8.8-7.tar.xz b/ImageMagick-6.8.8-7.tar.xz new file mode 100644 index 0000000..a995d6b --- /dev/null +++ b/ImageMagick-6.8.8-7.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..fa3bb1c --- /dev/null +++ b/ImageMagick-6.8.8-7.tar.xz.asc @@ -0,0 +1,17 @@ +-----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.changes b/ImageMagick.changes index a12a90f..eceddb2 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 26 20:17:35 UTC 2014 - opensuse@dstoecker.de + +- update to 6.8.8-7 + ------------------------------------------------------------------- Wed Feb 26 15:59:07 UTC 2014 - schwab@suse.de diff --git a/ImageMagick.spec b/ImageMagick.spec index 6281a5d..b873061 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -398,4 +398,7 @@ support multiple generations of an image in memory at one time. HTML documentation for ImageMagick library and scene examples. + + + %changelog From 00a306ae73051f78d58a61f89d89f9905f3944e34ae78d5b9e5457473b84219e Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:25:21 +0000 Subject: [PATCH 07/13] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=190 --- ImageMagick.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index b873061..a69b52f 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -397,8 +397,4 @@ support multiple generations of an image in memory at one time. %description doc HTML documentation for ImageMagick library and scene examples. - - - - %changelog From f1340e34e7538cfe934cf9f78ba4d4ddb3c822e449e132b1258fefd35daedb6a Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:41:49 +0000 Subject: [PATCH 08/13] update OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=191 --- ImageMagick-6.7.6.1-no-dist-lzip.patch | 2 +- ImageMagick-6.8.5.7-no-XPMCompliance.patch | 2 +- ImageMagick.changes | 6 +----- ImageMagick.spec | 5 +---- disable_mat_test.patch | 13 ------------- 5 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 disable_mat_test.patch diff --git a/ImageMagick-6.7.6.1-no-dist-lzip.patch b/ImageMagick-6.7.6.1-no-dist-lzip.patch index c9a06c4..1204eb3 100644 --- a/ImageMagick-6.7.6.1-no-dist-lzip.patch +++ b/ImageMagick-6.7.6.1-no-dist-lzip.patch @@ -2,7 +2,7 @@ Index: ImageMagick-6.7.6-1/configure.ac =================================================================== --- ImageMagick-6.7.6-1.orig/configure.ac +++ ImageMagick-6.7.6-1/configure.ac -@@ -128,7 +128,7 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl +@@ -160,7 +160,7 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl # Ensure that make can run correctly AM_SANITY_CHECK diff --git a/ImageMagick-6.8.5.7-no-XPMCompliance.patch b/ImageMagick-6.8.5.7-no-XPMCompliance.patch index b56ba43..3fadb28 100644 --- a/ImageMagick-6.8.5.7-no-XPMCompliance.patch +++ b/ImageMagick-6.8.5.7-no-XPMCompliance.patch @@ -2,7 +2,7 @@ Index: ImageMagick-6.8.5-7/coders/xpm.c =================================================================== --- ImageMagick-6.8.5-7.orig/coders/xpm.c +++ ImageMagick-6.8.5-7/coders/xpm.c -@@ -382,7 +382,7 @@ static Image *ReadXPMImage(const ImageIn +@@ -386,7 +386,7 @@ static Image *ReadXPMImage(const ImageIn image->storage_class=DirectClass; image->matte=MagickTrue; } diff --git a/ImageMagick.changes b/ImageMagick.changes index eceddb2..e23248a 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -2,11 +2,7 @@ Wed Feb 26 20:17:35 UTC 2014 - opensuse@dstoecker.de - update to 6.8.8-7 - -------------------------------------------------------------------- -Wed Feb 26 15:59:07 UTC 2014 - schwab@suse.de - -- Apply disable_mat_test.patch also on m68k +- remove disable_mat_test.patch (fixed upstream) ------------------------------------------------------------------- Tue Feb 18 07:28:51 UTC 2014 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index a69b52f..877a481 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -78,7 +78,6 @@ Patch4: ImageMagick-6.8.5.7-no-XPMCompliance.patch # will ask upstream if needed, or if other solution exists Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch # http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=24957 -Patch12: disable_mat_test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick @@ -143,9 +142,6 @@ BuildArch: noarch %patch3 -p1 %patch4 -p1 %patch11 -p1 -%ifarch ppc ppc64 s390 s390x m68k -%patch12 -%endif %build export CFLAGS="$RPM_OPT_FLAGS" @@ -397,4 +393,5 @@ support multiple generations of an image in memory at one time. %description doc HTML documentation for ImageMagick library and scene examples. + %changelog diff --git a/disable_mat_test.patch b/disable_mat_test.patch deleted file mode 100644 index 559ea19..0000000 --- a/disable_mat_test.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: PerlMagick/t/read.t -=================================================================== ---- PerlMagick/t/read.t.orig 2013-11-18 14:03:16.000000000 +0100 -+++ PerlMagick/t/read.t 2014-02-13 15:03:03.017996724 +0100 -@@ -74,7 +74,7 @@ - - print("MAT (MatLab gray 64-bit LSB double) ...\n"); - ++$test; --testReadCompare('input_gray_lsb_double.mat', 'reference/read/input_gray_lsb_double_mat.miff', q//, 0.2, 1.02); -+testReadCompare('input_gray_lsb_double.mat', 'reference/read/input_gray_lsb_double_mat.miff', q//, 0.22, 1.02); - - print("MAT (MatLab RGB 8-bit LSB integer) ...\n"); - ++$test; From 35c184cdb12a177fb0c3dccf125348f6278d0f4996935c511e99d173eaf4ab97 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:42:59 +0000 Subject: [PATCH 09/13] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=192 --- ImageMagick.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 877a481..87f9a24 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -392,6 +392,4 @@ support multiple generations of an image in memory at one time. %description doc HTML documentation for ImageMagick library and scene examples. - - -%changelog +%changelog \ No newline at end of file From dad2f804287d46d77d2399d614cca40268d9b76979ed1a61893fc7735da10ed8 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:43:23 +0000 Subject: [PATCH 10/13] update OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=193 --- ImageMagick.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 87f9a24..386331e 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -392,4 +392,5 @@ support multiple generations of an image in memory at one time. %description doc HTML documentation for ImageMagick library and scene examples. -%changelog \ No newline at end of file + +%changelog From 98652cbfb8f122855f5f707ebf9328d68102554958df6d3a0936d431bc4b21bd Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:45:13 +0000 Subject: [PATCH 11/13] update OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=194 --- ImageMagick.spec | 192 +++++++++++++++++++++++------------------------ 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 386331e..bf9c45b 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -133,6 +133,102 @@ Group: Development/Libraries/C and C++ BuildArch: noarch %endif +%description +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, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +different image formats. Image processing operations are available from +the command line as well as through C, C++, and PERL-based programming +interfaces. + +%description devel +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, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +different image formats. Image processing operations are available from +the command line as well as through C, C++, and PERL-based programming +interfaces. + +%description extra +This package adds support for djvu, wmf and jpeg2000 formats and +installs optional helper applications. + +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, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +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} +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, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +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} +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, +you can create images dynamically, making it suitable for Web +applications. You can also resize, rotate, sharpen, color-reduce, or +add special effects to an image and save your completed work in many +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 perl-PerlMagick +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} +This is Magick++, the object-oriented C++ API for the ImageMagick +image-processing library. + +Magick++ supports an object model inspired by PerlMagick. Magick++ +should be faster than PerlMagick since it is written in a compiled +language which is not parsed at run-time. This makes it suitable for +Web CGI programs. Images support implicit reference counting so that +copy constructors and assignment incur almost no cost. The cost of +actually copying an image (if necessary) is done just before +modification and this copy is managed automatically by Magick++. +De-referenced copies are automatically deleted. The image objects +support value (rather than pointer) semantics so it is trivial to +support multiple generations of an image in memory at one time. + +%description -n libMagick++-devel +This is Magick++, the object-oriented C++ API for the ImageMagick +image-processing library. + +Magick++ supports an object model inspired by PerlMagick. Magick++ +should be faster than PerlMagick since it is written in a compiled +language which is not parsed at run-time. This makes it suitable for +Web CGI programs. Images support implicit reference counting so that +copy constructors and assignment incur almost no cost. The cost of +actually copying an image (if necessary) is done just before +modification and this copy is managed automatically by Magick++. +De-referenced copies are automatically deleted. The image objects +support value (rather than pointer) semantics so it is trivial to +support multiple generations of an image in memory at one time. + +%description doc +HTML documentation for ImageMagick library and scene examples. + %prep %{?gpg_verify: %gpg_verify %{S:3}} %setup -n ImageMagick-%{source_version} @@ -297,100 +393,4 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ %defattr(-,root,root) %{_docdir}/%{name}-doc -%description -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, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -different image formats. Image processing operations are available from -the command line as well as through C, C++, and PERL-based programming -interfaces. - -%description devel -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, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -different image formats. Image processing operations are available from -the command line as well as through C, C++, and PERL-based programming -interfaces. - -%description extra -This package adds support for djvu, wmf and jpeg2000 formats and -installs optional helper applications. - -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, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -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} -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, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -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} -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, -you can create images dynamically, making it suitable for Web -applications. You can also resize, rotate, sharpen, color-reduce, or -add special effects to an image and save your completed work in many -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 perl-PerlMagick -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} -This is Magick++, the object-oriented C++ API for the ImageMagick -image-processing library. - -Magick++ supports an object model inspired by PerlMagick. Magick++ -should be faster than PerlMagick since it is written in a compiled -language which is not parsed at run-time. This makes it suitable for -Web CGI programs. Images support implicit reference counting so that -copy constructors and assignment incur almost no cost. The cost of -actually copying an image (if necessary) is done just before -modification and this copy is managed automatically by Magick++. -De-referenced copies are automatically deleted. The image objects -support value (rather than pointer) semantics so it is trivial to -support multiple generations of an image in memory at one time. - -%description -n libMagick++-devel -This is Magick++, the object-oriented C++ API for the ImageMagick -image-processing library. - -Magick++ supports an object model inspired by PerlMagick. Magick++ -should be faster than PerlMagick since it is written in a compiled -language which is not parsed at run-time. This makes it suitable for -Web CGI programs. Images support implicit reference counting so that -copy constructors and assignment incur almost no cost. The cost of -actually copying an image (if necessary) is done just before -modification and this copy is managed automatically by Magick++. -De-referenced copies are automatically deleted. The image objects -support value (rather than pointer) semantics so it is trivial to -support multiple generations of an image in memory at one time. - -%description doc -HTML documentation for ImageMagick library and scene examples. - %changelog From f0ea876f0bfa6118116207f002fbfd73247296828e6efe33de164ca53afcc4b0 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 26 Feb 2014 20:56:28 +0000 Subject: [PATCH 12/13] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=195 --- ImageMagick.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index bf9c45b..d6c111d 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -77,7 +77,6 @@ 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 -# http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=24957 BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick From 60ce402023b600d88c212b96a5487354f4bd7f40b60f997fa04b0e0346745fb6 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 27 Feb 2014 08:35:22 +0000 Subject: [PATCH 13/13] - fix baselibs OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=196 --- ImageMagick.changes | 5 +++++ baselibs.conf | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index e23248a..f032977 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 27 08:25:02 UTC 2014 - pgajdos@suse.com + +- fix baselibs + ------------------------------------------------------------------- Wed Feb 26 20:17:35 UTC 2014 - opensuse@dstoecker.de diff --git a/baselibs.conf b/baselibs.conf index 34e404c..3bae474 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,10 +1,10 @@ -libMagickCore-6_Q16-1 -libMagickWand-6_Q16-1 +libMagickCore-6_Q16-2 +libMagickWand-6_Q16-2 libMagick++-6_Q16-3 ImageMagick-devel requires -ImageMagick- - requires "libMagickCore-6_Q16-1- = " - requires "libMagickWand-6_Q16-1- = " + requires "libMagickCore-6_Q16-2- = " + requires "libMagickWand-6_Q16-2- = " libMagick++-devel requires -ImageMagick- requires "libMagick++-6_Q16-3- = "