diff --git a/ImageMagick-6.9.6-5.tar.xz b/ImageMagick-6.9.6-5.tar.xz deleted file mode 100644 index fbcc129..0000000 --- a/ImageMagick-6.9.6-5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d0122ba93a3f16d09cadcd4228f996c0048f0a44d92113d3d61150faa78f40c -size 8762376 diff --git a/ImageMagick-6.9.6-5.tar.xz.asc b/ImageMagick-6.9.6-5.tar.xz.asc deleted file mode 100644 index 53f8444..0000000 --- a/ImageMagick-6.9.6-5.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABAgAGBQJYKv45AAoJEImrY9SCdzd65mEQAKm3h6a4hZh1QmTQUwH6EXsB -ek3MKBPVRkc0xFlCqox5k+4PjfzskOA94zEMVk0K2zyiq85HX/fewa3nWNgqGEo3 -ujc/kNGM++jRGIsgUIySYYZFmRnxriJileY6lCv4+3sa/IfXfJP5KHNiQ73cRqtz -BlPZQFWN6TQ9/H6rGeL9cglrQxKaJvwCiWHtUhWToKmA6k1nWTTTfkdlE06Dff7i -vI6KSC2fgLn3V6KcF21EFf8df6mk2PRxgc0MUktBa4s3K5UJ+eUSWfPo8SExqs89 -0I+Z8++RP2pm/WMfS8dbPBk5mZdMO2c30mqrz1jkRJTjZ2tny8MHxUBn90sger9A -kGnhq57xOeQsBT/omhvQVvRjcGzVWZ8JlSA4X35qZ1DRPan6q8vNFnKlZN509JMd -YmAh8TPpfMnj2jDJo2Gnb9qTCiddOigVdgz4vbbGxQumE7vJW98f+eRVOWehbw9W -/7gQ/fgvmyXJLkvDY19ZcXlTClEZ7bQVYdTqamJLCvwpiApfFFf9O50LWGNkwBsN -1TjodGDVtFyH0OAc7LqezlagPwSRW6lqucctAo9UP8Z+qRdTsiIqDwYoMHrvQlEG -w+ReMI1eGe8vWCa4PXkhW0yvgq4cS8Z040ac9ZCBNsEqGf5B+XJNjzK866lgXW5D -9lHjQ5ceICnBKmaHfl+R -=odjZ ------END PGP SIGNATURE----- diff --git a/ImageMagick-6.9.6-6.tar.xz b/ImageMagick-6.9.6-6.tar.xz new file mode 100644 index 0000000..c8faa75 --- /dev/null +++ b/ImageMagick-6.9.6-6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cd1fe001d3ecb68b7d053ede40950d411956d47afc5267acc3ca57a77070d0a +size 8787060 diff --git a/ImageMagick-6.9.6-6.tar.xz.asc b/ImageMagick-6.9.6-6.tar.xz.asc new file mode 100644 index 0000000..439e0c7 --- /dev/null +++ b/ImageMagick-6.9.6-6.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABAgAGBQJYOHKTAAoJEImrY9SCdzd6+h0P/A6cNdhITiThTvFyqrGOideS +XyPH7//bEIyTpvTr/c2YR5mPvK0bItrQ8opPFn04PmlUzGUepWSLz2IH2TZm5y4b +v3SScWOYfGWLrQZsS50OIxLthWbVA7UuaiILlN2ZPIRJeqtk1OSqL9ur9LSiquHo +41yzPK93w/ySBG+leIfoYS0DG52EQBaaiiXoWAIxbLuJanuv6KwmkfJJKzV/dGUY +xQc9ypLa6XrFN2nOmPylgW6ldoPr0R5C9qVNjiJ4F44TF0GRhPAI/rBBkxcvikqt +sMQsf5QHWEg5qVzGFuXfFqvXrHkSVCt5OrugVG3CD9GFtuwp1g6Ejlc9XHnx2LKk +HCNRxTgQxRfLd8wKe3pfNBm7QFqryxnqpjMsFxji2Y0hVFex37m/WeVqgy7OCsE4 +yFm2jfVCSNRB4h6RiCSPy7I0q8Pj9SQercyQY/abHF7s/9DBvEzrvQisKbZzGl58 +SQiE/JRTW+o8fMTa4nqcAYvj41CC5ublavrzBnXk2iUR2SmlkjsLP/AwfNw9ui7o +ygdhQ2nbqztyErUU3tPZl8OyHjjPSrD23eckDPwYQypK5cNi3Ev9oapKn31b1n61 +sE2jnczSb8n+qzgCjniHf3AxmSp3qe/ctrmPEjgDQ3pCYDoLacfRE1E6CowXuCwi +9oDLGx/tMvFSazeD4gkO +=RZuv +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 954cff3..e7da164 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Dec 2 08:01:19 UTC 2016 - pgajdos@suse.com + +- updated to 6.9.6-6 + * If a convenient line break is not found, force it for caption: (reference + https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30887). + * Off by 1 error when computing the standard deviation (reference + https://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=30866). + * Apply Debian patches, (reference + https://github.com/ImageMagick/ImageMagick/issues/304). + * Permit EPT images with just a TIFF or EPS image, not both (reference + https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30921). + * The -clone option no longer leak memory. +- turn on make check along perl test + ------------------------------------------------------------------- Tue Nov 22 09:32:21 UTC 2016 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index c41abb6..a4acfda 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -63,7 +63,7 @@ BuildRequires: zip %define maj 6 %define mfr_version %{maj}.9.6 -%define mfr_revision 5 +%define mfr_revision 6 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 2 @@ -303,7 +303,7 @@ make -j1 perl-build %if 0%{?suse_version} >= 1140 %check -exit 0 +make check export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs @@ -317,11 +317,13 @@ make test DESTDIR=%{buildroot} \ pkgdocdir=%{_defaultdocdir}/%{name}/ %perl_process_packlist -cd 'Magick++' - %{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} - PATH='/bin:/usr/bin' find demo -type f -perm /111 -execdir %{__rm} -rf '{}' ';' - %{__mv} demo/makefile.2 demo/Makefile -cd .. +# remove unneded files from Magick++/demo for %doc, but not in place +# they are needed for make check +cp -r Magick++/demo . +%{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} +PATH='/bin:/usr/bin' find demo -type f -perm /111 -execdir %{__rm} -rf '{}' ';' +%{__mv} demo/makefile.2 demo/Makefile +### %{__mv} -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ -execdir %{__sed} -i -e 's@ -L/usr/src[^ ]*@@g' -e 's@ /usr/lib/libltdl.la@@g' '{}' ';' @@ -418,7 +420,7 @@ PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ %files -n libMagick++-devel %defattr(-,root,root) -%doc Magick++/demo +%doc demo %doc Magick++/NEWS Magick++/README Magick++/AUTHORS %{_libdir}/libMagick++*.so %{_includedir}/ImageMagick*/Magick++.h