Accepting request 236957 from graphics

OBS-URL: https://build.opensuse.org/request/show/236957
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=106

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.12 nostdinc 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-xz dist-zip])
  
  # Enable support for silent build rules
  m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

ImageMagick-6.8.8-7.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea5753a42329b0c251c753053b66078891a3733f929051f7e9190446f39ab2f4
-size 7448900

ImageMagick-6.8.8-7.tar.xz.asc

@@ -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-----

ImageMagick-6.8.9-3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aca0c1af5b2db84a39dcb7ac109be542965af61ebab967c84d26541f475ba9d1
+size 7555684

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-----

ImageMagick.changes

@@ -1,3 +1,75 @@
+-------------------------------------------------------------------
+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
+
+- 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.
+  * 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
+  * 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.
+  * Improved performance of parsing the xmp profile.
+  * Fixed detecting transparency in PSD files.
+
+-------------------------------------------------------------------
+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
+
+- 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
+
+- 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
 

ImageMagick.spec

@@ -20,21 +20,24 @@ Name:           ImageMagick
 
 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-devel
-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
 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
@@ -42,18 +45,29 @@ BuildRequires:  libwebp-devel
 BuildRequires:  libwmf-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  lzma-devel
+%if 0%{?suse_version} >= 1310
+BuildRequires:  mupdf-devel-static
+%endif
+%if 0%{?suse_version} >= 1140
 BuildRequires:  openexr-devel
-BuildRequires:  openjpeg2-devel
+%endif
+BuildRequires:  openjpeg2-devel >= 2.1.0
+%if 0%{?suse_version} >= 1140
+BuildRequires:  p7zip
+%endif
 BuildRequires:  pango-devel
 BuildRequires:  pkgconfig
+BuildRequires:  xdg-utils
+BuildRequires:  xz
+BuildRequires:  zip
 
 %define maj           6
-%define mfr_version   %{maj}.8.8
+%define mfr_version   %{maj}.8.9
-%define mfr_revision  7
+%define mfr_revision  3
 %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
@@ -230,8 +244,7 @@ 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 -q -n ImageMagick-%{source_version}
-%setup -n ImageMagick-%{source_version}
 %patch0
 %patch1
 %patch2  -p1
@@ -271,6 +284,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
@@ -278,6 +292,7 @@ export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs
 export MAGICK_CONFIGURE_PATH=$PWD/config
 cd PerlMagick
 make test
+%endif
 
 %install
 %{__make} install \
@@ -376,6 +391,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)