The package rpms/ImageMagick.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/ImageMagick.git/commit/?id=dc8e940db....
Change: +ExcludeArch: s390x ppc64
Thanks.
Full change: ============
commit dc8e940dbe42f1c6cb8a9e10fa7c27a689905db3 Author: Moez Roy moez.roy@gmail.com Date: Thu Aug 24 03:36:39 2017 +0500
exclude s390x ppc64
diff --git a/ImageMagick.spec b/ImageMagick.spec index cbda4f0..b6d58bc 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,6 +1,11 @@ %global VERSION 7.0.6 %global Patchlevel 9
+# https://bugzilla.redhat.com/show_bug.cgi?id=1484578 & https://bugzilla.redhat.com/show_bug.cgi?id=1484579 +ExcludeArch: s390x ppc64 + + + Name: ImageMagick Version: %{VERSION} Release: %{Patchlevel}.2%{?dist}
commit 335b6bb60168ae0416d5b4113ef3e7ef1d0e938a Author: Moez Roy moez.roy@gmail.com Date: Thu Aug 24 02:47:55 2017 +0500
,
diff --git a/ImageMagick.spec b/ImageMagick.spec index b93a3c8..cbda4f0 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -16,7 +16,7 @@ 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: 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
commit 2f17834ad37196f5cd319c169c4ad29e6c186ea0 Author: Moez Roy moez.roy@gmail.com Date: Thu Aug 24 02:47:04 2017 +0500
jasper-devel, libtool-ltdl-devel
diff --git a/ImageMagick.spec b/ImageMagick.spec index b54b27f..b93a3c8 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -16,7 +16,7 @@ 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 +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 @@ -45,7 +45,7 @@ ImageMagick-devel as well. 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 +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}
commit e1de2e23abf9fa6ed341b91a67c9fe8a0c727c2d Author: Moez Roy moez.roy@gmail.com Date: Thu Aug 24 02:31:38 2017 +0500
nvr try 2
diff --git a/ImageMagick.spec b/ImageMagick.spec index a1b8331..b54b27f 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -2,8 +2,8 @@ %global Patchlevel 9
Name: ImageMagick -Version: %{VERSION}.%{Patchlevel} -Release: 2%{?dist} +Version: %{VERSION} +Release: %{Patchlevel}.2%{?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
commit aac8b1333c9fd4d2e91cddcd7a088deffaef9cfc Author: Moez Roy moez.roy@gmail.com Date: Thu Aug 24 02:23:45 2017 +0500
try without patch
diff --git a/ImageMagick.spec b/ImageMagick.spec index 3969096..a1b8331 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -23,7 +23,7 @@ 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 +#Patch0: ImageMagick-6.9.9-3-multiarch-implicit-pkgconfig-dir.patch
%description ImageMagick is an image display and manipulation tool for the X @@ -137,7 +137,7 @@ however. %prep %setup -q -n %{name}-%{VERSION}-%{Patchlevel}
-%patch0 -p1 -b .multiarch-implicit-pkgconfig-dir +#%patch0 -p1 -b .multiarch-implicit-pkgconfig-dir
# for %%doc mkdir Magick++/examples
commit e90a622f0374796e8c3e6e537951e4de37eedcea Author: Moez Roy moez.roy@gmail.com Date: Thu Aug 24 02:21:14 2017 +0500
make sure nvr has dist version
diff --git a/ImageMagick.spec b/ImageMagick.spec index ef593a1..3969096 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -2,8 +2,8 @@ %global Patchlevel 9
Name: ImageMagick -Version: %{VERSION} -Release: %{Patchlevel} +Version: %{VERSION}.%{Patchlevel} +Release: 2%{?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
commit 93ebcaebf8caab401c478ff705e7fccc27f19539 Author: Moez Roy moez.roy@gmail.com Date: Thu Aug 24 02:11:45 2017 +0500
commit the sources file
diff --git a/.gitignore b/.gitignore index e0395ab..1893b49 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ ImageMagick-6.4.0-multilib.patch /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 diff --git a/sources b/sources index 98e3023..b314f67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ImageMagick-6.9.9-3.tar.xz) = df1cad5cd087d18dea233eec52a7b1119d766a551b26b606e3e9b03547db5a3c132980608eccad16dd8415158e449c63bc0baf725995ccc3ddfe254d5008f676 +SHA512 (ImageMagick-7.0.6-9.tar.bz2) = 1265907eca65700514b53a0c9ee9e0af53ec1ff9b4d32976dbe0b5963ec4a094508c30a87e84036f49ec7da3a9627c5e90554994c3435863e9edc1d3abc8e63c
commit caa67b9a5df584477357388bfa551a4143615683 Author: Moez Roy moez.roy@gmail.com Date: Thu Aug 24 02:10:15 2017 +0500
update to latest upstream
diff --git a/ImageMagick.spec b/ImageMagick.spec index 7080c60..ef593a1 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,27 +1,27 @@ -%global VER 6.9.9 -%global Patchlevel 3 - -Name: ImageMagick -Version: %{VER}.%{Patchlevel} -Release: 3%{?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/%%7Bname%7D-%%7BVER%7D-%%7BPatchlevel%7... - -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 VERSION 7.0.6 +%global Patchlevel 9 + +Name: ImageMagick +Version: %{VERSION} +Release: %{Patchlevel} +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/%%7Bname%7D/%%7Bname%7D-%%7BVERSION%7D-... + +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 +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
@@ -42,13 +42,13 @@ ImageMagick-devel as well.
%package devel -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} +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 +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}
%description devel ImageMagick-devel contains the library links and header files you'll @@ -135,7 +135,7 @@ however.
%prep -%setup -q -n %{name}-%{VER}-%{Patchlevel} +%setup -q -n %{name}-%{VERSION}-%{Patchlevel}
%patch0 -p1 -b .multiarch-implicit-pkgconfig-dir
@@ -144,25 +144,24 @@ 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/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.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/MagickCore/.libs' LDDLFLAGS='-shared -L$PWD/MagickCore/.libs'" \ + --without-dps \ + --without-gcc-arch \ + --with-jbig \ + --with-openjp2
# Do *NOT* use %%{?_smp_mflags}, this causes PerlMagick to be silently misbuild make @@ -170,10 +169,13 @@ make
%install make %{?_smp_mflags} install DESTDIR=%{buildroot} INSTALL="install -p" -cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VER} +cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VERSION} # 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
@@ -185,14 +187,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. @@ -216,9 +218,9 @@ cat >$1 <<EOF EOF }
-multilibFileVersions %{buildroot}%{_includedir}/%{name}-6/magick/magick-config.h -multilibFileVersions %{buildroot}%{_includedir}/%{name}-6/magick/magick-baseconfig.h -multilibFileVersions %{buildroot}%{_includedir}/%{name}-6/magick/version.h +multilibFileVersions %{buildroot}%{_includedir}/%{name}-7/MagickCore/magick-config.h +multilibFileVersions %{buildroot}%{_includedir}/%{name}-7/MagickCore/magick-baseconfig.h +multilibFileVersions %{buildroot}%{_includedir}/%{name}-7/MagickCore/version.h
# Fonts must be packaged separately. It does not have matter and demos work without it. @@ -245,60 +247,52 @@ make %{?_smp_mflags} check
%files libs %doc LICENSE NOTICE AUTHORS.txt QuickStart.txt -%{_libdir}/libMagickCore-6.Q16.so.5* -%{_libdir}/libMagickWand-6.Q16.so.5* -%{_libdir}/%{name}-%{VER} -%{_datadir}/%{name}-6 -%exclude %{_libdir}/%{name}-%{VER}/modules-Q16/coders/djvu.* -%dir %{_sysconfdir}/%{name}-6 -%config(noreplace) %{_sysconfdir}/%{name}-6/*.xml +%{_libdir}/libMagickCore-7.Q16HDRI.so.* +%{_libdir}/libMagickWand-7.Q16HDRI.so.* +%{_libdir}/%{name}-%{VERSION} +%{_datadir}/%{name}-7 +%exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16HDRI/coders/djvu.* +%dir %{_sysconfdir}/%{name}-7 +%config(noreplace) %{_sysconfdir}/%{name}-7/*.xml
%files devel %{_bindir}/MagickCore-config -%{_bindir}/Magick-config %{_bindir}/MagickWand-config -%{_bindir}/Wand-config -%{_libdir}/libMagickCore-6.Q16.so -%{_libdir}/libMagickWand-6.Q16.so +%{_libdir}/libMagickCore-7.Q16HDRI.so +%{_libdir}/libMagickWand-7.Q16HDRI.so %{_libdir}/pkgconfig/MagickCore.pc -%{_libdir}/pkgconfig/MagickCore-6.Q16.pc +%{_libdir}/pkgconfig/MagickCore-7.Q16HDRI.pc %{_libdir}/pkgconfig/ImageMagick.pc -%{_libdir}/pkgconfig/ImageMagick-6.Q16.pc +%{_libdir}/pkgconfig/ImageMagick-7.Q16HDRI.pc %{_libdir}/pkgconfig/MagickWand.pc -%{_libdir}/pkgconfig/MagickWand-6.Q16.pc -%{_libdir}/pkgconfig/Wand.pc -%{_libdir}/pkgconfig/Wand-6.Q16.pc -%dir %{_includedir}/%{name}-6 -%{_includedir}/%{name}-6/magick -%{_includedir}/%{name}-6/wand -%{_mandir}/man1/Magick-config.* +%{_libdir}/pkgconfig/MagickWand-7.Q16HDRI.pc +%dir %{_includedir}/%{name}-7 +%{_includedir}/%{name}-7/MagickCore +%{_includedir}/%{name}-7/MagickWand %{_mandir}/man1/MagickCore-config.* -%{_mandir}/man1/Wand-config.* %{_mandir}/man1/MagickWand-config.*
%files djvu -%{_libdir}/%{name}-%{VER}/modules-Q16/coders/djvu.* +%{_libdir}/%{name}-%{VERSION}/modules-Q16HDRI/coders/djvu.*
%files doc -%doc %{_datadir}/doc/%{name}-6 -%doc %{_datadir}/doc/%{name}-%{VER} +%doc %{_datadir}/doc/%{name}-7 +%doc %{_datadir}/doc/%{name}-%{VERSION} %doc LICENSE
%files c++ %doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README %doc www/Magick++/COPYING -%{_libdir}/libMagick++-6.Q16.so.8* +%{_libdir}/libMagick++-7.Q16HDRI.so.*
%files c++-devel %doc Magick++/examples %{_bindir}/Magick++-config -%{_includedir}/%{name}-6/Magick++ -%{_includedir}/%{name}-6/Magick++.h -%{_libdir}/libMagick++-6.Q16.so +%{_includedir}/%{name}-7/Magick++ +%{_includedir}/%{name}-7/Magick++.h +%{_libdir}/libMagick++-7.Q16HDRI.so %{_libdir}/pkgconfig/Magick++.pc -%{_libdir}/pkgconfig/Magick++-6.Q16.pc -%{_libdir}/pkgconfig/ImageMagick++.pc -%{_libdir}/pkgconfig/ImageMagick++-6.Q16.pc +%{_libdir}/pkgconfig/Magick++-7.Q16HDRI.pc %{_mandir}/man1/Magick++-config.*
%files perl -f perl-pkg-files @@ -306,6 +300,9 @@ make %{?_smp_mflags} check %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
%changelog +* Wed Aug 23 2017 Moez Roy moez.roy@gmail.com - 7.0.6.9 +- update to latest upstream + * Wed Aug 02 2017 Fedora Release Engineering releng@fedoraproject.org - 6.9.9.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild