commit ImageMagick for openSUSE:Factory
Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at 2017-09-29 11:49:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ImageMagick (Old) and /work/SRC/openSUSE:Factory/.ImageMagick.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ImageMagick" Fri Sep 29 11:49:14 2017 rev:144 rq:528770 version:7.0.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick.changes 2017-09-15 20:58:40.674065519 +0200 +++ /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick.changes 2017-09-29 11:49:16.586497595 +0200 @@ -1,0 +2,19 @@ +Tue Sep 26 10:15:50 UTC 2017 - pgajdos@suse.com + +- updated to 7.0.7-4 + * Fixed numerous memory leaks. + * Maximum valid hour is 23, not 24, in the PNG tIME chunk, and maximum + valid minute is 59, not 60. + * Use signed integer arithmetic to calculate timezone corrections. + +------------------------------------------------------------------- +Mon Sep 11 12:20:31 UTC 2017 - pgajdos@suse.com + +- builds for sle11 + +------------------------------------------------------------------- +Mon Sep 11 11:22:02 UTC 2017 - pgajdos@suse.com + +- builds for sle12 + +------------------------------------------------------------------- Old: ---- ImageMagick-7.0.7-1.tar.xz ImageMagick-7.0.7-1.tar.xz.asc New: ---- ImageMagick-7.0.7-4.tar.bz2 ImageMagick-7.0.7-4.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.U5Tmv7/_old 2017-09-29 11:49:18.378244924 +0200 +++ /var/tmp/diff_new_pack.U5Tmv7/_new 2017-09-29 11:49:18.382244360 +0200 @@ -18,7 +18,7 @@ %define maj 7 %define mfr_version %{maj}.0.7 -%define mfr_revision 1 +%define mfr_revision 4 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 4 @@ -32,49 +32,82 @@ License: ImageMagick Group: Productivity/Graphics/Other Url: http://www.imagemagick.org -Source0: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz +Source0: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.bz2 Source1: baselibs.conf -Source2: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz.asc +Source2: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.bz2.asc Source3: ImageMagick.keyring # suse specific patches Patch0: ImageMagick-disable-insecure-coders.patch # workaround, see https://github.com/ImageMagick/ImageMagick/issues/439 Patch1: ImageMagick-relax-filter.t.patch Patch2: ImageMagick-library-installable-in-parallel.patch -BuildRequires: autoconf >= 2.69 BuildRequires: chrpath BuildRequires: dcraw +%if 0%{?suse_version} >= 1315 BuildRequires: dejavu-fonts +%endif BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: libjasper-devel +%if 0%{?suse_version} >= 1315 BuildRequires: libjbig-devel +%endif +BuildRequires: libjasper-devel BuildRequires: libjpeg-devel BuildRequires: libtool BuildRequires: libwmf-devel BuildRequires: lzma-devel +%if 0%{?suse_version} > 1315 BuildRequires: mupdf-devel-static +%endif +%if 0%{?suse_version} >= 1315 BuildRequires: p7zip BuildRequires: pkgconfig +%endif BuildRequires: xdg-utils -BuildRequires: xz BuildRequires: zip +%if 0%{?suse_version} >= 1315 BuildRequires: pkgconfig(OpenEXR) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(ddjvuapi) BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(freetype2) +%if 0%{?suse_version} > 1315 BuildRequires: pkgconfig(ijs) +%else +BuildRequires: ghostscript-fonts-other +BuildRequires: ghostscript-fonts-std +BuildRequires: ghostscript-library +%endif BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libexif) +%if 0%{?suse_version} > 1315 BuildRequires: pkgconfig(libopenjp2) >= 2.1.0 +%endif BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libtiff-4) >= 4.0.3 BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libxml-2.0) +%if 0%{?suse_version} > 1315 BuildRequires: pkgconfig(lqr-1) +%endif BuildRequires: pkgconfig(pango) +%else +BuildRequires: OpenEXR-devel +BuildRequires: fftw3-devel +BuildRequires: freetype2-devel +BuildRequires: ghostscript-fonts-other +BuildRequires: ghostscript-fonts-std +BuildRequires: ghostscript-library +BuildRequires: libbz2-devel +BuildRequires: libdjvulibre-devel +BuildRequires: libexif-devel +BuildRequires: librsvg-devel +BuildRequires: libtiff-devel +BuildRequires: libxml-devel +BuildRequires: perl-parent +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%endif %package -n perl-PerlMagick Summary: Perl interface for ImageMagick @@ -91,7 +124,11 @@ Requires: libMagickCore%{libspec}%{clibver} = %{version} Requires: libMagickWand%{libspec}%{cwandver} = %{version} # bnc#741947: +%if 0%{?suse_version} >= 1315 Requires: pkgconfig(bzip2) +%else +Requires: libbz2-devel +%endif %package extra Summary: Viewer and Converter for Images - extra codecs @@ -124,12 +161,18 @@ Group: Development/Libraries/C and C++ Requires: libMagick++%{libspec}%{cxxlibver} = %{version} Requires: libstdc++-devel +%if 0%{?suse_version} >= 1315 Requires: pkgconfig(ImageMagick) = %{mfr_version} +%else +Requires: ImageMagick-devel = %{version} +%endif %package doc Summary: Document Files for ImageMagick Library Group: Development/Libraries/C and C++ +%if 0%{?suse_version} >= 1315 BuildArch: noarch +%endif %description ImageMagick is a robust collection of tools and libraries to read, @@ -252,7 +295,9 @@ --with-djvu \ --with-lcms \ --with-jbig \ +%if 0%{?suse_version} > 1315 --with-openjp2 \ +%endif --with-openexr \ --with-rsvg \ --with-webp \ @@ -260,7 +305,8 @@ --with-quantum-depth=%{quantum_depth} \ --without-gcc-arch \ --enable-pipes=no \ - --enable-reproducible-build=yes + --enable-reproducible-build=yes \ + --disable-openmp # don't build together, PerlMagick could be miscompiled when using parallel build[1] # [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec make %{?_smp_mflags} all @@ -268,6 +314,9 @@ # mostly because */demo is used later with %check # polutting dir with .libs etc. cp -r Magick++/demo Magick++/examples +%if 0%{?suse_version} < 1315 +rm -r Magick++/examples/.deps +%endif cp -r PerlMagick/demo PerlMagick/examples # other improvements dos2unix www/api/*.php @@ -284,7 +333,11 @@ # checksums rm t/montage.t %endif +%if 0%{?suse_version} >= 1315 make %{?_smp_mflags} test +%else +make test_dynamic +%endif cd .. %install @@ -320,12 +373,18 @@ %postun -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig %files +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %doc LICENSE ChangeLog NEWS.txt %{_bindir}/[^MW]* %{_mandir}/man1/* %exclude %{_mandir}/man1/*-config.1%{ext_man} %files -n libMagickCore%{libspec}%{clibver} +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %doc LICENSE ChangeLog NEWS.txt %{_libdir}/libMagickCore*.so.%{clibver}* %dir %{_sysconfdir}/ImageMagick* @@ -334,7 +393,9 @@ %dir %{_libdir}/ImageMagick*/modules* %dir %{_libdir}/ImageMagick*/modules*/* %exclude %{_libdir}/ImageMagick*/modules*/*/wmf.* +%if 0%{?suse_version} > 1315 %exclude %{_libdir}/ImageMagick*/modules*/*/jp2.* +%endif %exclude %{_libdir}/ImageMagick*/modules*/*/djvu.* %{_libdir}/ImageMagick*/modules*/*/*.so # don't remove la files, see bnc#579798 @@ -342,17 +403,28 @@ %{_libdir}/ImageMagick*/config* %files -n libMagickWand%{libspec}%{cwandver} +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %{_libdir}/libMagickWand*.so.%{cwandver}* %files extra +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %{_libdir}/ImageMagick*/modules*/*/wmf.so # don't remove la files, see bnc#579798 +%if 0%{?suse_version} > 1315 %{_libdir}/ImageMagick*/modules*/*/jp2.so %{_libdir}/ImageMagick*/modules*/*/jp2.la +%endif %{_libdir}/ImageMagick*/modules*/*/djvu.so %{_libdir}/ImageMagick*/modules*/*/djvu.la %files devel +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %{_libdir}/libMagickCore*.so %{_libdir}/libMagickWand*.so %dir %{_includedir}/ImageMagick* @@ -369,16 +441,28 @@ %exclude %{_mandir}/man1/Magick++-config.1%{ext_man} %files -n perl-PerlMagick +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %doc PerlMagick/README.txt %doc PerlMagick/examples %{_mandir}/man3/* %{perl_vendorarch}/auto/Image %{perl_vendorarch}/Image +%if 0%{?suse_version} < 1315 +/var/adm/perl-modules/ImageMagick +%endif %files -n libMagick++%{libspec}%{cxxlibver} +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %{_libdir}/libMagick++*.so.%{cxxlibver}* %files -n libMagick++-devel +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %doc Magick++/examples %doc Magick++/NEWS Magick++/README Magick++/AUTHORS %{_libdir}/libMagick++*.so @@ -389,6 +473,9 @@ %{_mandir}/man1/Magick++-config.1%{ext_man} %files doc +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %{_defaultdocdir}/%{name}-%{maj} %changelog ++++++ ImageMagick-7.0.7-1.tar.xz -> ImageMagick-7.0.7-4.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick-7.0.7-1.tar.xz /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick-7.0.7-4.tar.bz2 differ: char 1, line 1
participants (1)
-
root@hilbert.suse.de