diff --git a/.gitignore b/.gitignore index 1893b49..6a01b84 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1 @@ -ImageMagick-6.6.2-1.tar.xz -ImageMagick-6.4.0-multilib.patch -/ImageMagick-6.6.4-1.tar.xz -/ImageMagick-6.4.0-multilib.patch -/ImageMagick-6.6.4-8.tar.xz -/ImageMagick-6.6.5-10.tar.xz -/ImageMagick-6.6.8-4.tar.xz -/ImageMagick-6.7.0-10.tar.xz -/ImageMagick-6.7.1-9.tar.xz -/ImageMagick-6.7.5-6.tar.xz -/ImageMagick-6.7.6-5.tar.xz -/ImageMagick-6.7.7-5.tar.xz -/ImageMagick-6.7.8-9.tar.xz -/ImageMagick-6.8.3-9.tar.xz -/ImageMagick-6.8.5-10.tar.xz -/ImageMagick-6.8.6-3.tar.xz -/ImageMagick-6.8.7-0.tar.xz -/ImageMagick-6.8.8-10.tar.xz -/ImageMagick-6.9.0-9.tar.xz -/ImageMagick-6.9.0-10.tar.xz -/ImageMagick-6.9.1-2.tar.xz -/ImageMagick-6.9.1-3.tar.bz2 -/ImageMagick-6.9.2-7.tar.xz -/ImageMagick-6.9.3-0.tar.xz -/ImageMagick-6.9.9-3.tar.xz -/ImageMagick-7.0.6-9.tar.bz2 +/ImageMagick-6.9.9-9.tar.xz diff --git a/ImageMagick-7.0.6-9-skip-tests.patch b/ImageMagick-7.0.6-9-skip-tests.patch deleted file mode 100644 index cf499e8..0000000 --- a/ImageMagick-7.0.6-9-skip-tests.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up ImageMagick-7.0.6-9/Magick++/tests/tests.tap.orig ImageMagick-7.0.6-9/Magick++/tests/tests.tap ---- ImageMagick-7.0.6-9/Magick++/tests/tests.tap.orig 2017-08-24 11:21:06.524124594 +0200 -+++ ImageMagick-7.0.6-9/Magick++/tests/tests.tap 2017-08-24 11:21:11.904162249 +0200 -@@ -8,14 +8,14 @@ - # - subdir=Magick++/tests - . ./common.shi --echo "1..13" -+echo "1..11" - - SRCDIR=${top_srcdir}/${subdir}/ - export SRCDIR - - cd ${subdir} || exit 1 - --for mytest in appendImages attributes averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages -+for mytest in averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages - do - ./${mytest} && echo "ok" || echo "not ok" - done diff --git a/ImageMagick.spec b/ImageMagick.spec index 3b8930f..7108785 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,29 +1,29 @@ -%global VER 7.0.6 -%global Patchlevel 9 - -Name: ImageMagick -Version: %{VER}.%{Patchlevel} -Release: 4%{?dist} -Summary: Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats. In addition resize, rotate, shear, distort and transform images. -Group: Applications/Multimedia -License: https://www.imagemagick.org/script/license.php -Url: https://www.imagemagick.org/ -Source0: https://www.imagemagick.org/download/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.bz2 -# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1484579 -Patch0: ImageMagick-7.0.6-9-skip-tests.patch - -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel -BuildRequires: libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1 -BuildRequires: perl-generators -BuildRequires: ghostscript-devel, djvulibre-devel -BuildRequires: libwmf-devel, jasper-devel, libtool-ltdl-devel -BuildRequires: libX11-devel, libXext-devel, libXt-devel -BuildRequires: lcms2-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel -BuildRequires: fftw-devel, OpenEXR-devel, libwebp-devel -BuildRequires: jbigkit-devel -BuildRequires: openjpeg2-devel >= 2.1.0 +%global VER 6.9.9 +%global Patchlevel 9 + +Name: ImageMagick +Version: %{VER}.%{Patchlevel} +Release: 1%{?dist} +Summary: An X application for displaying and manipulating images +Group: Applications/Multimedia +License: ImageMagick +Url: http://www.imagemagick.org/ +Source0: https://www.imagemagick.org/download/%{name}-%{VER}-%{Patchlevel}.tar.xz + +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel +BuildRequires: libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1 +BuildRequires: perl-generators +BuildRequires: ghostscript-devel, djvulibre-devel +BuildRequires: libwmf-devel, jasper-devel, libtool-ltdl-devel +BuildRequires: libX11-devel, libXext-devel, libXt-devel +BuildRequires: lcms2-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel +BuildRequires: fftw-devel, OpenEXR-devel, libwebp-devel +BuildRequires: jbigkit-devel +BuildRequires: openjpeg2-devel >= 2.1.0 + +Patch0: ImageMagick-6.9.9-3-multiarch-implicit-pkgconfig-dir.patch %description ImageMagick is an image display and manipulation tool for the X @@ -42,13 +42,13 @@ ImageMagick-devel as well. %package devel -Summary: Library links and header files for ImageMagick application development -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libX11-devel, libXext-devel, libXt-devel, ghostscript-devel, jasper-devel, libtool-ltdl-devel -Requires: bzip2-devel, freetype-devel, libtiff-devel, libjpeg-devel, lcms2-devel -Requires: libwebp-devel, OpenEXR-devel, openjpeg2-devel, pkgconfig -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Summary: Library links and header files for ImageMagick app development +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libX11-devel, libXext-devel, libXt-devel, ghostscript-devel +Requires: bzip2-devel, freetype-devel, libtiff-devel, libjpeg-devel, lcms2-devel +Requires: libwebp-devel, OpenEXR-devel, jasper-devel, pkgconfig +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel ImageMagick-devel contains the library links and header files you'll @@ -137,35 +137,32 @@ however. %prep %setup -q -n %{name}-%{VER}-%{Patchlevel} -# skip some tests on big endian arches -# https://bugzilla.redhat.com/show_bug.cgi?id=1484579 -%ifarch ppc64 s390x -%patch0 -p1 -b .big-endian -%endif +%patch0 -p1 -b .multiarch-implicit-pkgconfig-dir # for %%doc mkdir Magick++/examples cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples %build -%configure --enable-shared \ - --disable-static \ - --with-modules \ - --with-perl \ - --with-x \ - --with-threads \ - --with-magick_plus_plus \ - --with-gslib \ - --with-wmf \ - --with-webp \ - --with-openexr \ - --with-rsvg \ - --with-xml \ - --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/MagickCore/.libs' LDDLFLAGS='-shared -L$PWD/MagickCore/.libs'" \ - --without-dps \ - --without-gcc-arch \ - --with-jbig \ - --with-openjp2 +%configure \ + --enable-shared \ + --disable-static \ + --with-modules \ + --with-perl \ + --with-x \ + --with-threads \ + --with-magick_plus_plus \ + --with-gslib \ + --with-wmf \ + --with-webp \ + --with-openexr \ + --with-rsvg \ + --with-xml \ + --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ + --without-dps \ + --without-gcc-arch \ + --with-jbig \ + --with-openjp2 # Do *NOT* use %%{?_smp_mflags}, this causes PerlMagick to be silently misbuild make @@ -177,9 +174,6 @@ cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VER} # Delete *ONLY* _libdir/*.la files! .la files used internally to handle plugins - BUG#185237!!! rm %{buildroot}%{_libdir}/*.la -# fix weird perl Magick.so permissions -chmod 755 %{buildroot}%{perl_vendorarch}/auto/Image/Magick/*/*.so - # perlmagick: fix perl path of demo files %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl @@ -191,14 +185,14 @@ find %{buildroot} -name "perllocal.pod" |xargs rm -f # perlmagick: build files list echo "%defattr(-,root,root,-)" > perl-pkg-files find %{buildroot}/%{_libdir}/perl* -type f -print \ - | sed "s@^%{buildroot}@@g" > perl-pkg-files + | sed "s@^%{buildroot}@@g" > perl-pkg-files find %{buildroot}%{perl_vendorarch} -type d -print \ - | sed "s@^%{buildroot}@%dir @g" \ - | grep -v '^%dir %{perl_vendorarch}$' \ - | grep -v '/auto$' >> perl-pkg-files + | sed "s@^%{buildroot}@%dir @g" \ + | grep -v '^%dir %{perl_vendorarch}$' \ + | grep -v '/auto$' >> perl-pkg-files if [ -z perl-pkg-files ] ; then - echo "ERROR: EMPTY FILE LIST" - exit -1 + echo "ERROR: EMPTY FILE LIST" + exit -1 fi # fix multilib issues: Rename provided file with platform-bits in name. @@ -222,9 +216,9 @@ cat >$1 < - 6.9.9.9-1 +- Update to 6.9.9-9 (for F27 and Rawhide, revert to 6.9.9-9) + * Thu Aug 24 2017 Adam Williamson - 7.0.6.9-4 - Correct versioning (patchlevel is *upstream*, not downstream) diff --git a/magick_small.png b/magick_small.png deleted file mode 100644 index 7d9b6cc..0000000 Binary files a/magick_small.png and /dev/null differ diff --git a/sources b/sources index b314f67..b9c65d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ImageMagick-7.0.6-9.tar.bz2) = 1265907eca65700514b53a0c9ee9e0af53ec1ff9b4d32976dbe0b5963ec4a094508c30a87e84036f49ec7da3a9627c5e90554994c3435863e9edc1d3abc8e63c +SHA512 (ImageMagick-6.9.9-9.tar.xz) = d024f753e1bf234e38736935f38a9bf82969ca77130059383f9d1871a39f68d7678a546d2786d57d602744e2008909df3f2ab08e1207b4c97c0952e7b03876d8