pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 186110 from graphics

Browse Source 
- updated to 6.8.6-7
  * Fix memory leak in CloneImageArtifacts and CloneImageProfiles.
  * JPEG ICC color profile requires null after ICC tag 
  * etc.
- employ gpg-offline

OBS-URL: https://build.opensuse.org/request/show/186110
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=95
This commit is contained in:
Tomáš Chvátal 2013-08-12 12:24:57 +00:00 committed by Git OBS Bridge
commit 9fc9046400
7 changed files with 121 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ImageMagick-6.8.5-7.tar.bz2
View File

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

3
ImageMagick-6.8.6-7.tar.xz Normal file
View File

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

17
ImageMagick-6.8.6-7.tar.xz.asc Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (GNU/Linux)
iQIcBAABAgAGBQJR8F2bAAoJEImrY9SCdzd6ZLcP/1Ku//As8Y4Fvzq9nJpHRJZP
sVgPCXkf4D2+1pPfhwpCHG8+nmgTSsCpdssL9KMFi17GidGfSHdnCQZbLJ4szDQ6
ICi+bbQZfLM52ZvkKi8beKxe/ASbaUkbUrtCvzKtl3SRThbrSCa2JbAK5aaAzAbf
RLc+ph1iftono7Jh+2XpkxooXsDGy25yHS5WVONS9VoR+NQgeQSzKcVwqKu6E5BA
TTOfZRaikjSr/N+zmD7Lilc7BHVeBPtJeAHPMy8/Rkyvs3B5i7w8yH/eZCI0Lq3p
bZzenXpwyZEOpWd3aG4fk96ki4J682/8XzJie1hn0boSJXM7yCfoVsoCLSX6XSn+
ELpM7V/8ZF93LUdd7O80e7ntEhEluj+wQnrcQgMG7262tMr9LI3Z3QLlIk6R4z0b
xHskqvfZxE6jvDbxXbvUils3Wswf2VBm/S4gnpWN3X6Wt4bc2I93QJRtJr8ydz/C
vyRPDtlGraiaIHqEg2HV72jUwgCOwDKwWyQfQVmoYhJBfVu7GEP0+pw+Y3zDbuxO
VVGZ+bVw2RItcvazxGdCygBIXS7G/q/D8Pts3ajohoQGoDU5GMC97OmgwpwoXU5p
paVQWqVI8/66AcGVfvHaULg2of9Q4w9sN2YbtjNY+EhCSXeSOpPRyOWxT+abBJ8p
72VhF94bspkgsElErAI9
=Jl/a
-----END PGP SIGNATURE-----

9
ImageMagick.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Aug 6 09:59:32 UTC 2013 - pgajdos@suse.com
- updated to 6.8.6-7
* Fix memory leak in CloneImageArtifacts and CloneImageProfiles.
* JPEG ICC color profile requires null after ICC tag
* etc.
- employ gpg-offline
-------------------------------------------------------------------
Mon Jun 17 08:37:56 UTC 2013 - pgajdos@suse.com

53
ImageMagick.keyring Normal file
View File

@ -0,0 +1,53 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.20 (GNU/Linux)
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
Ujew
=X6Ea
-----END PGP PUBLIC KEY BLOCK-----

64
ImageMagick.spec
View File

@ -26,6 +26,9 @@ 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
@ -42,11 +45,12 @@ BuildRequires: lzma-devel
BuildRequires: pango-devel
BuildRequires: pkgconfig
%define mfr_version 6.8.5
%define mfr_version 6.8.6
%define mfr_revision 7
%define quantum_depth 8
%define source_version %{mfr_version}-%{mfr_revision}
%define libver 1
%define clibver 1
%define cxxlibver 2
%define libspec -6_Q%{quantum_depth}
Version: %{mfr_version}.%{mfr_revision}
Release: 0
@ -54,10 +58,12 @@ Summary: Viewer and Converter for Images
License: SUSE-ImageMagick
Group: Productivity/Graphics/Other
Url: http://www.imagemagick.org
Source: ImageMagick-%{source_version}.tar.bz2
Source: ftp://mirror.checkdomain.de/imagemagick/ImageMagick-%{source_version}.tar.xz
# To get mtime of file
Source1: ImageMagick.changes
Source2: baselibs.conf
Source3: ftp://mirror.checkdomain.de/imagemagick/ImageMagick-%{source_version}.tar.xz.asc
Source4: ImageMagick.keyring
# suse specific patches
Patch0: ImageMagick-6.6.8.9-examples.patch
Patch1: ImageMagick-6.6.8.9-doc.patch
@ -73,15 +79,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package -n perl-PerlMagick
Requires: ImageMagick = %{version}
Requires: libMagickCore%{libspec}-%{libver} = %{version}
Requires: libMagickCore%{libspec}-%{clibver} = %{version}
Requires: perl = %{perl_version}
Summary: Perl interface for ImageMagick
Group: Development/Libraries/Perl
%package devel
Requires: ImageMagick = %{version}
Requires: libMagickCore%{libspec}-%{libver} = %{version}
Requires: libMagickWand%{libspec}-%{libver} = %{version}
Requires: libMagickCore%{libspec}-%{clibver} = %{version}
Requires: libMagickWand%{libspec}-%{clibver} = %{version}
Summary: Include Files and Libraries Mandatory for Development
Group: Development/Libraries/C and C++
Requires: glibc-devel
@ -90,29 +96,29 @@ Requires: libbz2-devel
%package extra
Requires: ImageMagick = %{version}
Requires: libMagickCore%{libspec}-%{libver} = %{version}
Requires: libMagickCore%{libspec}-%{clibver} = %{version}
Summary: Viewer and Converter for Images - extra codecs
Group: Productivity/Graphics/Other
#delegates configured in delegates.xml that imagemagick can use
Recommends: autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf
%package -n libMagickCore%{libspec}-%{libver}
%package -n libMagickCore%{libspec}-%{clibver}
Summary: Viewer and Converter for Images - runtime library
Group: Productivity/Graphics/Other
Suggests: ImageMagick-extra = %{version}
%package -n libMagickWand%{libspec}-%{libver}
%package -n libMagickWand%{libspec}-%{clibver}
Summary: Viewer and Converter for Images - runtime library
Group: Productivity/Graphics/Other
%package -n libMagick++%{libspec}-%{libver}
%package -n libMagick++%{libspec}-%{cxxlibver}
Requires: ImageMagick
Summary: C++ Interface for ImageMagick - runtime library
Group: Development/Libraries/C and C++
%package -n libMagick++-devel
Requires: ImageMagick-devel = %{version}
Requires: libMagick++%{libspec}-%{libver} = %{version}
Requires: libMagick++%{libspec}-%{cxxlibver} = %{version}
Requires: libstdc++-devel
Summary: C++ Interface for ImageMagick - files mandatory for development
Group: Development/Libraries/C and C++
@ -125,6 +131,7 @@ BuildArch: noarch
%endif
%prep
%{?gpg_verify: %gpg_verify %{S:3}}
%setup -n ImageMagick-%{source_version}
%patch0
%patch1
@ -189,17 +196,17 @@ PATH='/bin:/usr/bin' find "${RPM_BUILD_ROOT}/%{_libdir}" -name "*.la" ! -empty \
%endif
rm -rf %{buildroot}/%{_datadir}/doc/%{name}
%post -n libMagickCore%{libspec}-%{libver} -p /sbin/ldconfig
%post -n libMagickCore%{libspec}-%{clibver} -p /sbin/ldconfig
%postun -n libMagickCore%{libspec}-%{libver} -p /sbin/ldconfig
%postun -n libMagickCore%{libspec}-%{clibver} -p /sbin/ldconfig
%post -n libMagickWand%{libspec}-%{libver} -p /sbin/ldconfig
%post -n libMagickWand%{libspec}-%{clibver} -p /sbin/ldconfig
%postun -n libMagickWand%{libspec}-%{libver} -p /sbin/ldconfig
%postun -n libMagickWand%{libspec}-%{clibver} -p /sbin/ldconfig
%post -n libMagick++%{libspec}-%{libver} -p /sbin/ldconfig
%post -n libMagick++%{libspec}-%{cxxlibver} -p /sbin/ldconfig
%postun -n libMagick++%{libspec}-%{libver} -p /sbin/ldconfig
%postun -n libMagick++%{libspec}-%{cxxlibver} -p /sbin/ldconfig
%files
%defattr(-,root,root)
@ -209,12 +216,12 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
%doc %{_mandir}/man1/*
%exclude %{_mandir}/man1/*-config.1.gz
%files -n libMagickCore%{libspec}-%{libver}
%files -n libMagickCore%{libspec}-%{clibver}
%defattr(-,root,root)
%doc LICENSE
%dir %{_sysconfdir}/ImageMagick*
%config %{_sysconfdir}/ImageMagick*/*
%{_libdir}/libMagickCore*.so.%{libver}*
%{_libdir}/libMagickCore*.so.%{clibver}*
%dir %{_libdir}/ImageMagick*
%dir %{_libdir}/ImageMagick*/modules*
%dir %{_libdir}/ImageMagick*/modules*/*
@ -226,10 +233,10 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
%{_libdir}/ImageMagick*/modules*/*/*.la
%{_libdir}/ImageMagick*/config*
%files -n libMagickWand%{libspec}-%{libver}
%files -n libMagickWand%{libspec}-%{clibver}
%defattr(-,root,root)
%doc LICENSE
%{_libdir}/libMagickWand*.so.%{libver}*
%{_libdir}/libMagickWand*.so.%{clibver}*
%files extra
%defattr(-,root,root)
@ -254,7 +261,6 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
%{_bindir}/MagickWand-config
%{_bindir}/Magick-config
%{_bindir}/Wand-config
%{_libdir}/pkgconfig/MagickWand*.pc
%{_libdir}/pkgconfig/MagickCore*.pc
%{_libdir}/pkgconfig/ImageMagick.pc
%{_libdir}/pkgconfig/ImageMagick-*.pc
@ -271,10 +277,10 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
%{perl_vendorarch}/auto/Image
%{perl_vendorarch}/Image
%files -n libMagick++%{libspec}-%{libver}
%files -n libMagick++%{libspec}-%{cxxlibver}
%defattr(-,root,root)
%doc LICENSE
%{_libdir}/libMagick++*.so.%{libver}*
%{_libdir}/libMagick++*.so.%{cxxlibver}*
%files -n libMagick++-devel
%defattr(-,root,root)
@ -329,7 +335,7 @@ 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}-%{libver}
%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,
@ -340,7 +346,7 @@ 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}-%{libver}
%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,
@ -356,7 +362,7 @@ 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}-%{libver}
%description -n libMagick++%{libspec}-%{cxxlibver}
This is Magick++, the object-oriented C++ API for the ImageMagick
image-processing library.
@ -404,4 +410,8 @@ HTML documentation for ImageMagick library and scene examples.
%changelog

4
baselibs.conf
View File

@ -1,11 +1,11 @@
libMagickCore-6_Q8-1
libMagickWand-6_Q8-1
libMagick++-6_Q8-1
libMagick++-6_Q8-2
ImageMagick-devel
requires -ImageMagick-<targettype>
requires "libMagickCore-6_Q8-1-<targettype> = <version>"
requires "libMagickWand-6_Q8-1-<targettype> = <version>"
libMagick++-devel
requires -ImageMagick-<targettype>
requires "libMagick++-6_Q8-1-<targettype> = <version>"
requires "libMagick++-6_Q8-2-<targettype> = <version>"