Accepting request 531538 from graphics

- updated to 7.0.7-6
  * Reset the magick_list_initialized boolean when needed.
  * Fixed numerous memory leaks.
  * Support URW-base35 fonts.
  * Removed "ping_preserve_iCCP=MagickTrue;" statement that was 
    inadvertently added to coders/png.c.

- %make_install only for sle12 and higher

- Update package summaries and RPM groups.
  Make use of %make_install.

OBS-URL: https://build.opensuse.org/request/show/531538
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=145
This commit is contained in:
Dominique Leuenberger 2017-10-10 09:35:20 +00:00 committed by Git OBS Bridge
commit bd7bc5d3bd
6 changed files with 57 additions and 32 deletions

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJZxpyXAAoJEImrY9SCdzd61yAP/jElq7azyg6JlAsqpqIk+gsv
qi+RzOKOOjWXU6jj8ULvYorw5+/14yE1bTQt4WpJL/0X1F3jDoUlEwXNlAc2tbrJ
5kIhiFEEc8kVCBqQa4s0j/u4xKnk6IE/6TkXJzYKPLPKx6E8WAg+CrLQul7Zym8O
kKER2If3jaUnnOSWqzMldRcKgOKrWR0KpRWWfdlQVbvF0dIqWNgk+WukybekYR4L
bSqUpU12z48kTaDCG29JHeg2bJgVRAwYfFLugydOaPbFZBpTfdHSmT1SOt5JLgUR
/hS+RXZr/0o0BV92xlzABMiRrK9UjCRK9A7WWb4o/yWDkh7OUb6gPjvIInLcTA4n
D7ToLvtE7005qj8I3ngza+LUFh2bpiBpI3CMp1dj39QKzMfNVL/UWOnkWydlMpTT
gMPU39Qg+TYZq0d6ueu0wzjs8pypicT7sa3jMv9G0sVpX8fiNnI3M48aN8TKcQz+
so6RXo2wxcLQE7BWCIkoig/NUX+kfOQ2BpONyJdN1GccqPngUinpoqWYs9xmU+TZ
EPhCWAqaijbQoig22wA9bBTdcpV9B2jqH7SfYkQ4w3nV7sdBPAtcFF1b8mh42NI/
6v7m5Gx8mzMyZH19ym6lRQ4NfeRHjZCMufZTXBy359MTY+pou/W9rLdg/s78MTU6
JsJdY/G+D+yp5967jkli
=+PRF
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJZ1P0qAAoJEImrY9SCdzd60RgP/2SjXr6t9cfAs16RglBy1spR
Q0TvDuykRd3VUXq+N2sla8m/8uAwnM3/10rULPgaS+v0sjKFNHJ+NsjJvFqVDvTu
9uooFjdRjbEDCTlF6ZyFCfky5sj46n3qMLqmMNP9s7aOU527xVDKoHT3r78Eepbr
cTyx9w3+NsTgLPrWPPJiYh+E2+IOAY6UnM31yo1WGoMNwC7kEgaq3EaboP2PMRqz
BJv214+OYN9MTap27d/YBLGK6LPSPleEVpu22kUmr91g/W0imum5ErcXfj4NUg3I
7Y/EP82hfq524YB1lTOQSVD+P+9lNgpKKV3Wt61nCsQcq8gnCYdpM92tFmzYXVIi
DGCJHptU47fPxp03MzTGqcpUwPnCflDfYDnKSeBNgGKmopy/RC0QPimHpgs954yG
884T7hgRhFwKNCyHedhRMtEnQKAuZ0C6l0h8GqWcia9tCvWjjsNt963/qhlrfo6D
SZmYdITCbIbRFstaclrCimpTYCvkEeVwDS34/moyJsc46vTYhN3qpSl55LQZ++/U
jC9S8GhSNdf5az+EZzVEyAcV70j2hlUrxix3YAgcuv8xpin78V5h+gDC/uLmeNO1
H9GomifD6hpOvRx/QVfQ+YXGa3sl8GWjKw7eOlp87Sxbn0n8W0+QJ4PEYJkoKIwJ
qA7l9Kdz9GK+zH9sUdLy
=xdH+
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Thu Oct 5 07:08:47 UTC 2017 - pgajdos@suse.com
- updated to 7.0.7-6
* Reset the magick_list_initialized boolean when needed.
* Fixed numerous memory leaks.
* Support URW-base35 fonts.
* Removed "ping_preserve_iCCP=MagickTrue;" statement that was
inadvertently added to coders/png.c.
-------------------------------------------------------------------
Tue Oct 3 17:59:11 UTC 2017 - pgajdos@suse.com
- %make_install only for sle12 and higher
-------------------------------------------------------------------
Mon Oct 2 21:48:11 UTC 2017 - jengelh@inai.de
- Update package summaries and RPM groups.
Make use of %make_install.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 26 10:15:50 UTC 2017 - pgajdos@suse.com Tue Sep 26 10:15:50 UTC 2017 - pgajdos@suse.com

View File

@ -18,7 +18,7 @@
%define maj 7 %define maj 7
%define mfr_version %{maj}.0.7 %define mfr_version %{maj}.0.7
%define mfr_revision 4 %define mfr_revision 6
%define quantum_depth 16 %define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision} %define source_version %{mfr_version}-%{mfr_revision}
%define clibver 4 %define clibver 4
@ -117,7 +117,7 @@ Requires: libMagickCore%{libspec}%{clibver} = %{version}
Requires: perl = %{perl_version} Requires: perl = %{perl_version}
%package devel %package devel
Summary: Include Files and Libraries Mandatory for Development Summary: Development files for ImageMagick's C interface
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: ImageMagick = %{version} Requires: ImageMagick = %{version}
Requires: glibc-devel Requires: glibc-devel
@ -131,7 +131,7 @@ Requires: libbz2-devel
%endif %endif
%package extra %package extra
Summary: Viewer and Converter for Images - extra codecs Summary: Extra codecs for the ImageMagick image viewer/converter
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
Requires: ImageMagick = %{version} Requires: ImageMagick = %{version}
Requires: libMagickCore%{libspec}%{clibver} = %{version} Requires: libMagickCore%{libspec}%{clibver} = %{version}
@ -143,21 +143,21 @@ Recommends: netpbm
Recommends: transfig Recommends: transfig
%package -n libMagickCore%{libspec}%{clibver} %package -n libMagickCore%{libspec}%{clibver}
Summary: Viewer and Converter for Images - runtime library Summary: C runtime library for ImageMagick
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
Suggests: ImageMagick-extra = %{version} Suggests: ImageMagick-extra = %{version}
%package -n libMagickWand%{libspec}%{cwandver} %package -n libMagickWand%{libspec}%{cwandver}
Summary: Viewer and Converter for Images - runtime library Summary: C runtime library for ImageMagick
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
%package -n libMagick++%{libspec}%{cxxlibver} %package -n libMagick++%{libspec}%{cxxlibver}
Summary: C++ Interface for ImageMagick - runtime library Summary: C++ interface runtime library for ImageMagick
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: ImageMagick Requires: ImageMagick
%package -n libMagick++-devel %package -n libMagick++-devel
Summary: C++ Interface for ImageMagick - files mandatory for development Summary: Development files for ImageMagick's C++ interface
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libMagick++%{libspec}%{cxxlibver} = %{version} Requires: libMagick++%{libspec}%{cxxlibver} = %{version}
Requires: libstdc++-devel Requires: libstdc++-devel
@ -169,7 +169,7 @@ Requires: ImageMagick-devel = %{version}
%package doc %package doc
Summary: Document Files for ImageMagick Library Summary: Document Files for ImageMagick Library
Group: Development/Libraries/C and C++ Group: Documentation/HTML
%if 0%{?suse_version} >= 1315 %if 0%{?suse_version} >= 1315
BuildArch: noarch BuildArch: noarch
%endif %endif
@ -182,7 +182,7 @@ you can create images dynamically, making it suitable for Web
applications. You can also resize, rotate, sharpen, color-reduce, or applications. You can also resize, rotate, sharpen, color-reduce, or
add special effects to an image and save your completed work in many add special effects to an image and save your completed work in many
different image formats. Image processing operations are available from different image formats. Image processing operations are available from
the command line as well as through C, C++, and PERL-based programming the command line as well as through C, C++, and Perl-based programming
interfaces. interfaces.
%description devel %description devel
@ -193,7 +193,7 @@ you can create images dynamically, making it suitable for Web
applications. You can also resize, rotate, sharpen, color-reduce, or applications. You can also resize, rotate, sharpen, color-reduce, or
add special effects to an image and save your completed work in many add special effects to an image and save your completed work in many
different image formats. Image processing operations are available from different image formats. Image processing operations are available from
the command line as well as through C, C++, and PERL-based programming the command line as well as through C, C++, and Perl-based programming
interfaces. interfaces.
%description extra %description extra
@ -207,7 +207,7 @@ you can create images dynamically, making it suitable for Web
applications. You can also resize, rotate, sharpen, color-reduce, or applications. You can also resize, rotate, sharpen, color-reduce, or
add special effects to an image and save your completed work in many add special effects to an image and save your completed work in many
different image formats. Image processing operations are available from different image formats. Image processing operations are available from
the command line as well as through C, C++, and PERL-based programming the command line as well as through C, C++, and Perl-based programming
interfaces. interfaces.
%description -n libMagickCore%{libspec}%{clibver} %description -n libMagickCore%{libspec}%{clibver}
@ -218,7 +218,7 @@ you can create images dynamically, making it suitable for Web
applications. You can also resize, rotate, sharpen, color-reduce, or applications. You can also resize, rotate, sharpen, color-reduce, or
add special effects to an image and save your completed work in many add special effects to an image and save your completed work in many
different image formats. Image processing operations are available from different image formats. Image processing operations are available from
the command line as well as through C, C++, and PERL-based programming the command line as well as through C, C++, and Perl-based programming
interfaces. interfaces.
%description -n libMagickWand%{libspec}%{cwandver} %description -n libMagickWand%{libspec}%{cwandver}
@ -229,7 +229,7 @@ you can create images dynamically, making it suitable for Web
applications. You can also resize, rotate, sharpen, color-reduce, or applications. You can also resize, rotate, sharpen, color-reduce, or
add special effects to an image and save your completed work in many add special effects to an image and save your completed work in many
different image formats. Image processing operations are available from different image formats. Image processing operations are available from
the command line as well as through C, C++, and PERL-based programming the command line as well as through C, C++, and Perl-based programming
interfaces. interfaces.
%description -n perl-PerlMagick %description -n perl-PerlMagick
@ -341,9 +341,13 @@ make test_dynamic
cd .. cd ..
%install %install
%if 0%{?suse_version} >= 1315
%make_install pkgdocdir=%{_defaultdocdir}/%{name}-%{maj}/
%else
make install \ make install \
DESTDIR=%{buildroot} \ DESTDIR=%{buildroot} \
pkgdocdir=%{_defaultdocdir}/%{name}-%{maj}/ pkgdocdir=%{_defaultdocdir}/%{name}-%{maj}/
%endif
# symlink header file relative to /usr/include/ImageMagick-7/ # symlink header file relative to /usr/include/ImageMagick-7/
# so that inclusions like wand/*.h and magick/*.h work # so that inclusions like wand/*.h and magick/*.h work
ln -s ./MagickCore %{buildroot}%{_includedir}/%{name}-%{maj}/magick ln -s ./MagickCore %{buildroot}%{_includedir}/%{name}-%{maj}/magick