Architecture specific change in rpms/ImageMagick.git
by githook-noreply@fedoraproject.org
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=dc8e94....
Change:
+ExcludeArch: s390x ppc64
Thanks.
Full change:
============
commit dc8e940dbe42f1c6cb8a9e10fa7c27a689905db3
Author: Moez Roy <moez.roy(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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/%{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
+%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/%{name}/%{name}-%{VERSION}-%{Patchle...
+
+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(a)gmail.com> - 7.0.6.9
+- update to latest upstream
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.9.9.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 8 months
Architecture specific change in rpms/ImageMagick.git
by githook-noreply@fedoraproject.org
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=dc8e94....
Change:
+ExcludeArch: s390x ppc64
Thanks.
Full change:
============
commit dc8e940dbe42f1c6cb8a9e10fa7c27a689905db3
Author: Moez Roy <moez.roy(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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/%{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
+%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/%{name}/%{name}-%{VERSION}-%{Patchle...
+
+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(a)gmail.com> - 7.0.6.9
+- update to latest upstream
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.9.9.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 8 months
Architecture specific change in rpms/openmpi.git
by githook-noreply@fedoraproject.org
The package rpms/openmpi.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/openmpi.git/commit/?id=85926666be....
Change:
+%ifnarch s390 s390x %{arm}
Thanks.
Full change:
============
commit 85926666be5a8609150a658e10a53e6901f6aa19
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 15:44:56 2017 -0700
Disable RDMA support on 32-bit ARM (#1484155)
diff --git a/openmpi.spec b/openmpi.spec
index 978517e..7d19bbb 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -21,7 +21,7 @@
Name: openmpi%{?_cc_name_suffix}
Version: 2.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Open Message Passing Interface
Group: Development/Libraries
License: BSD and MIT and Romio
@@ -37,6 +37,8 @@ Source4: macros.openmpi
BuildRequires: gcc-gfortran
%ifnarch s390 s390x
BuildRequires: valgrind-devel
+%endif
+%ifnarch s390 s390x %{arm}
BuildRequires: libibverbs-devel >= 1.1.3, opensm-devel > 3.3.0
BuildRequires: librdmacm-devel libibcm-devel
%endif
@@ -259,7 +261,7 @@ make check
%dir %{_libdir}/%{name}/share/openmpi
%{_libdir}/%{name}/share/openmpi/amca-param-sets
%{_libdir}/%{name}/share/openmpi/help*.txt
-%ifnarch s390 s390x
+%ifnarch s390 s390x %{arm}
%{_libdir}/%{name}/share/openmpi/mca-btl-openib-device-params.ini
%endif
@@ -305,6 +307,9 @@ make check
%changelog
+* Wed Aug 23 2017 Adam Williamson <awilliam(a)redhat.com> - 2.1.1-5
+- Disable RDMA support on 32-bit ARM (#1484155)
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 8 months
Architecture specific change in rpms/openmpi.git
by githook-noreply@fedoraproject.org
The package rpms/openmpi.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/openmpi.git/commit/?id=85926666be....
Change:
+%ifnarch s390 s390x %{arm}
Thanks.
Full change:
============
commit 85926666be5a8609150a658e10a53e6901f6aa19
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 15:44:56 2017 -0700
Disable RDMA support on 32-bit ARM (#1484155)
diff --git a/openmpi.spec b/openmpi.spec
index 978517e..7d19bbb 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -21,7 +21,7 @@
Name: openmpi%{?_cc_name_suffix}
Version: 2.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Open Message Passing Interface
Group: Development/Libraries
License: BSD and MIT and Romio
@@ -37,6 +37,8 @@ Source4: macros.openmpi
BuildRequires: gcc-gfortran
%ifnarch s390 s390x
BuildRequires: valgrind-devel
+%endif
+%ifnarch s390 s390x %{arm}
BuildRequires: libibverbs-devel >= 1.1.3, opensm-devel > 3.3.0
BuildRequires: librdmacm-devel libibcm-devel
%endif
@@ -259,7 +261,7 @@ make check
%dir %{_libdir}/%{name}/share/openmpi
%{_libdir}/%{name}/share/openmpi/amca-param-sets
%{_libdir}/%{name}/share/openmpi/help*.txt
-%ifnarch s390 s390x
+%ifnarch s390 s390x %{arm}
%{_libdir}/%{name}/share/openmpi/mca-btl-openib-device-params.ini
%endif
@@ -305,6 +307,9 @@ make check
%changelog
+* Wed Aug 23 2017 Adam Williamson <awilliam(a)redhat.com> - 2.1.1-5
+- Disable RDMA support on 32-bit ARM (#1484155)
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 8 months
Architecture specific change in rpms/grub2.git
by githook-noreply@fedoraproject.org
The package rpms/grub2.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/grub2.git/commit/?id=53a4172ac476....
Change:
+ExcludeArch: s390 s390x %{arm}
Thanks.
Full change:
============
commit 53a4172ac476e33bed92c0b7889d59aed0a44f60
Author: Peter Jones <pjones(a)redhat.com>
Date: Wed Aug 23 16:50:11 2017 -0400
Various fixups
- Put grub2-mkimage in -tools, not -tools-extra.
- Fix i686 building
- Fix ppc HFS+ usage due to /boot/efi's presence.
Signed-off-by: Peter Jones <pjones(a)redhat.com>
diff --git a/0193-Make-libgrub.pp-depend-on-config-util.h.patch b/0193-Make-libgrub.pp-depend-on-config-util.h.patch
new file mode 100644
index 0000000..332fb06
--- /dev/null
+++ b/0193-Make-libgrub.pp-depend-on-config-util.h.patch
@@ -0,0 +1,48 @@
+From 270c98a14f04ec48e93a67b32a66442773689ff4 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones(a)redhat.com>
+Date: Wed, 23 Aug 2017 10:37:27 -0400
+Subject: [PATCH] Make libgrub.pp depend on config-util.h
+
+If you build with "make -j48" a lot, sometimes you see:
+
+gcc -E -DHAVE_CONFIG_H -I. -I.. -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 -I./include -DGRUB_FILE=\"grub_script.tab.h\" -I. -I.. -I. -I.. -I../include -I./include -I../grub-core/lib/libgcrypt-grub/src/ -I../grub-core/lib/minilzo -I../grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 -I./include -DGRUB_FILE=\"grub_script.tab.h\" -I. -I.. -I. -I.. -I../include -I./include -I../grub-core/lib/libgcrypt-grub/src/ -I./grub-core/gnulib -I../grub-core/gnulib -I/builddir/build/BUILD/grub-2.02/grub-aarch64-efi-2.02 -D_FILE_OFFSET_BITS=64 \
+ -D'GRUB_MOD_INIT(x)=@MARKER@x@' grub_script.tab.h grub_script.yy.h ../grub-core/commands/blocklist.c ../grub-core/commands/macbless.c ../grub-core/commands/xnu_uuid.c ../grub-core/commands/testload.c ../grub-core/commands/ls.c ../grub-core/disk/dmraid_nvidia.c ../grub-core/disk/loopback.c ../grub-core/disk/lvm.c ../grub-core/disk/mdraid_linux.c ../grub-core/disk/mdraid_linux_be.c ../grub-core/disk/mdraid1x_linux.c ../grub-core/disk/raid5_recover.c ../grub-core/disk/raid6_recover.c ../grub-core/font/font.c ../grub-core/gfxmenu/font.c ../grub-core/normal/charset.c ../grub-core/video/fb/fbblit.c ../grub-core/video/fb/fbutil.c ../grub-core/video/fb/fbfill.c ../grub-core/video/fb/video_fb.c ../grub-core/video/video.c ../grub-core/video/capture.c ../grub-core/video/colors.c ../grub-core/unidata.c ../grub-core/io/bufio.c ../grub-core/fs/affs.c ../grub-core/fs/afs.c ../grub-core/fs/bfs.c ../grub-core/fs/btrfs.c ../grub-core/fs/cbfs.c ../grub-core/fs/cpio.c ../grub-core/fs/cpio_be.c ../grub-core/fs/odc.c ../grub-core/fs/newc.c ../grub-core/fs/ext2.c ../grub-core/fs/fat.c ../grub-core/fs/exfat.c ../grub-core/fs/fshelp.c ../grub-core/fs/hfs.c ../grub-core/fs/hfsplus.c ../grub-core/fs/hfspluscomp.c ../grub-core/fs/iso9660.c ../grub-core/fs/jfs.c ../grub-core/fs/minix.c ../grub-core/fs/minix2.c ../grub-core/fs/minix3.c ../grub-core/fs/minix_be.c ../grub-core/fs/minix2_be.c ../grub-core/fs/minix3_be.c ../grub-core/fs/nilfs2.c ../grub-core/fs/ntfs.c ../grub-core/fs/ntfscomp.c ../grub-core/fs/reiserfs.c ../grub-core/fs/romfs.c ../grub-core/fs/sfs.c ../grub-core/fs/squash4.c ../grub-core/fs/tar.c ../grub-core/fs/udf.c ../grub-core/fs/ufs2.c ../grub-core/fs/ufs.c ../grub-core/fs/ufs_be.c ../grub-core/fs/xfs.c ../grub-core/fs/zfs/zfscrypt.c ../grub-core/fs/zfs/zfs.c ../grub-core/fs/zfs/zfsinfo.c ../grub-core/fs/zfs/zfs_lzjb.c ../grub-core/fs/zfs/zfs_lz4.c ../grub-core/fs/zfs/zfs_sha256.c ../grub-core/fs/zfs/zfs_fletcher.c ../grub-core/lib/envblk.c ../grub-core/lib/hexdump.c ../grub-core/lib/LzFind.c ../grub-core/lib/LzmaEnc.c ../grub-core/lib/crc.c ../grub-core/lib/adler32.c ../grub-core/lib/crc64.c ../grub-core/normal/datetime.c ../grub-core/normal/misc.c ../grub-core/partmap/acorn.c ../grub-core/partmap/amiga.c ../grub-core/partmap/apple.c ../grub-core/partmap/sun.c ../grub-core/partmap/plan.c ../grub-core/partmap/dvh.c ../grub-core/partmap/sunpc.c ../grub-core/partmap/bsdlabel.c ../grub-core/partmap/dfly.c ../grub-core/script/function.c ../grub-core/script/lexer.c ../grub-core/script/main.c ../grub-core/script/script.c ../grub-core/script/argv.c ../grub-core/io/gzio.c ../grub-core/io/xzio.c ../grub-core/io/lzopio.c ../grub-core/kern/ia64/dl_helper.c ../grub-core/kern/arm/dl_helper.c ../grub-core/kern/arm64/dl_helper.c ../grub-core/lib/minilzo/minilzo.c ../grub-core/lib/xzembed/xz_dec_bcj.c ../grub-core/lib/xzembed/xz_dec_lzma2.c ../grub-core/lib/xzembed/xz_dec_stream.c ../util/misc.c ../grub-core/kern/command.c ../grub-core/kern/device.c ../grub-core/kern/disk.c ../grub-core/lib/disk.c ../util/getroot.c ../grub-core/osdep/unix/getroot.c ../grub-core/osdep/getroot.c ../grub-core/osdep/devmapper/getroot.c ../grub-core/osdep/relpath.c ../grub-core/kern/emu/hostdisk.c ../grub-core/osdep/devmapper/hostdisk.c ../grub-core/osdep/hostdisk.c ../grub-core/osdep/unix/hostdisk.c ../grub-core/osdep/exec.c ../grub-core/osdep/sleep.c ../grub-core/osdep/password.c ../grub-core/kern/emu/misc.c ../grub-core/kern/emu/mm.c ../grub-core/kern/env.c ../grub-core/kern/err.c ../grub-core/kern/file.c ../grub-core/kern/fs.c ../grub-core/kern/list.c ../grub-core/kern/misc.c ../grub-core/kern/partition.c ../grub-core/lib/crypto.c ../grub-core/disk/luks.c ../grub-core/disk/geli.c ../grub-core/disk/cryptodisk.c ../grub-core/disk/AFSplitter.c ../grub-core/lib/pbkdf2.c ../grub-core/commands/extcmd.c ../grub-core/lib/arg.c ../grub-core/disk/ldm.c ../grub-core/disk/diskfilter.c ../grub-core/partmap/gpt.c ../grub-core/partmap/msdos.c ../grub-core/fs/proc.c ../grub-core/fs/archelp.c > libgrub.pp || (rm -f libgrub.pp; exit 1)
+rm -f stamp-h1
+touch ../config-util.h.in
+cd . && /bin/sh ./config.status config-util.h
+config.status: creating config-util.h
+In file included from ../include/grub/mm.h:25:0,
+ from ../include/grub/disk.h:29,
+ from ../include/grub/file.h:26,
+ from ../grub-core/fs/btrfs.c:21:
+./config.h:38:10: fatal error: ./config-util.h: No such file or directory
+ #include <config-util.h>
+ ^~~~~~~~~~~~~~~
+compilation terminated.
+make: *** [Makefile:13098: libgrub.pp] Error 1
+
+This is because libgrub.pp is built with -DGRUB_UTIL=1, which means
+it'll try to include config-util.h, but a parallel make is actually
+building that file. I think.
+
+Signed-off-by: Peter Jones <pjones(a)redhat.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 7795baeb6..c7b0e6a9c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -37,7 +37,7 @@ grub_script.yy.c: grub_script.yy.h
+ CLEANFILES += grub_script.yy.c grub_script.yy.h
+
+ # For libgrub.a
+-libgrub.pp: grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES)
++libgrub.pp: config-util.h grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES)
+ $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgrubmods_a_CPPFLAGS) $(libgrubkern_a_CPPFLAGS) $(CPPFLAGS) \
+ -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1)
+ CLEANFILES += libgrub.pp
+--
+2.13.5
+
diff --git a/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
new file mode 100644
index 0000000..fcf0496
--- /dev/null
+++ b/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
@@ -0,0 +1,44 @@
+From fafbdc268d3ea0fbebd2589083088adc1a3e8004 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones(a)redhat.com>
+Date: Thu, 20 Apr 2017 13:29:06 -0400
+Subject: [PATCH] Don't guess /boot/efi/ as HFS+ on ppc machines in
+ grub-install
+
+This should never be trying this, and since we've consolidated the
+grubenv to always be on /boot/efi/EFI/fedora/, this code causes it to
+always make the wrong decision.
+
+Resolves: rhbz#1484474
+
+Signed-off-by: Peter Jones <pjones(a)redhat.com>
+---
+ util/grub-install.c | 12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/util/grub-install.c b/util/grub-install.c
+index cd84a72b9..48f2abc3e 100644
+--- a/util/grub-install.c
++++ b/util/grub-install.c
+@@ -1159,18 +1159,8 @@ main (int argc, char *argv[])
+ char *d;
+
+ is_guess = 1;
+- d = grub_util_path_concat (2, bootdir, "macppc");
+- if (!grub_util_is_directory (d))
+- {
+- free (d);
+- d = grub_util_path_concat (2, bootdir, "efi");
+- }
+ /* Find the Mac HFS(+) System Partition. */
+- if (!grub_util_is_directory (d))
+- {
+- free (d);
+- d = grub_util_path_concat (2, bootdir, "EFI");
+- }
++ d = grub_util_path_concat (2, bootdir, "macppc");
+ if (!grub_util_is_directory (d))
+ {
+ free (d);
+--
+2.13.5
+
diff --git a/grub.macros b/grub.macros
index f23cf78..f190f48 100644
--- a/grub.macros
+++ b/grub.macros
@@ -61,6 +61,13 @@
%global platform ieee1275
%endif
+%ifarch %{ix86}
+%global target_cpu_name %{_arch}
+%global legacy_target_cpu_name i386
+%global legacy_package_arch pc
+%global platform pc
+%endif
+
%global efi_only aarch64 %{arm}
%global efi_arch x86_64 ia64 %{efi_only}
%ifarch %{efi_arch}
@@ -149,12 +156,14 @@
%global evr %{epoch}:%{version}-%{release}
-%if %{with_legacy_arch}
-%global with_efi_common 0
-%global with_legacy_common 1
-%else
+%ifarch x86_64
%global with_efi_common 1
+%global with_legacy_modules 0
%global with_legacy_common 0
+%else
+%global with_efi_common 0
+%global with_legacy_common 1
+%global with_legacy_modules 1
%endif
%define define_legacy_variant() \
@@ -174,14 +183,17 @@ Requires(post): dracut \
This subpackage provides support for %%{1} systems. \
\
%{expand:%%{?!buildsubdir:%%define buildsubdir grub-%%{1}-%{tarversion}}}\
-%{expand:%%package %%{1}-modules} \
+%{expand:%%if 0%%{with_legacy_modules} \
+%%package %%{1}-modules \
Summary: Modules used to build custom grub images \
Group: System Environment/Base \
BuildArch: noarch \
-Requires: %{name}-common = %{evr} \
-%{expand:%%description %%{1}-modules} \
-%{desc} \
+Requires: %%{name}-common = %%{evr} \
+%%description %%{1}-modules \
+%%{desc} \
This subpackage provides support for rebuilding your own grub.efi. \
+%%endif \
+} \
\
%{expand:%%{?!buildsubdir:%%define buildsubdir grub-%%{1}-%{tarversion}}}\
%{expand:%%package %%{1}-tools} \
@@ -437,6 +449,7 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \
%config(noreplace) %{_sysconfdir}/%{name}.cfg \
%ghost %config(noreplace) /boot/%{name}/grub.cfg \
\
+%{expand:%if 0%{?with_legacy_modules} \
%{expand:%%files %{1}-modules} \
%defattr(-,root,root) \
%dir %{_libdir}/grub/%{2}/ \
@@ -444,6 +457,9 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \
%exclude %{_libdir}/grub/%{2}/*.module \
%exclude %{_libdir}/grub/%{2}/{boot,boot_hybrid,cdboot,diskboot,lzma_decompress,pxeboot}.image \
%exclude %{_libdir}/grub/%{2}/*.o \
+%else \
+%%exclude %%{_libdir}/grub/%%{grublegacyarch}/* \
+%endif} \
%{nil}
%define define_efi_variant_files() \
diff --git a/grub.patches b/grub.patches
index f3ee6e1..aac5386 100644
--- a/grub.patches
+++ b/grub.patches
@@ -190,3 +190,5 @@ Patch0189: 0189-don-t-use-int-for-efi-status.patch
Patch0190: 0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
Patch0191: 0191-Clean-up-some-errors-in-the-linuxefi-loader.patch
Patch0192: 0192-editenv-handle-relative-symlinks.patch
+Patch0193: 0193-Make-libgrub.pp-depend-on-config-util.h.patch
+Patch0194: 0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
diff --git a/grub2.spec b/grub2.spec
index c9a24db..ae52d6c 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -54,7 +54,7 @@ BuildRequires: pesign >= 0.99-8
BuildRequires: ccache
%endif
-ExcludeArch: s390 s390x %{arm} %{?ix86}
+ExcludeArch: s390 s390x %{arm}
Obsoletes: %{name} <= %{evr}
%if 0%{with_legacy_arch}
@@ -490,8 +490,10 @@ fi
%endif
%changelog
-* Tue Aug 22 2017 Peter Jones <pjones(a)redhat.com> - 2.02-11
+* Wed Aug 23 2017 Peter Jones <pjones(a)redhat.com> - 2.02-11
- Put grub2-mkimage in -tools, not -tools-extra.
+- Fix i686 building
+- Fix ppc HFS+ usage due to /boot/efi's presence.
* Fri Aug 18 2017 Peter Jones <pjones(a)redhat.com> - 2.02-10
- Add the .img files into grub2-pc-modules (and all legacy variants)
6 years, 8 months
Architecture specific change in rpms/hwloc.git
by githook-noreply@fedoraproject.org
The package rpms/hwloc.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/hwloc.git/commit/?id=c733a4a7c5a5....
Change:
+%ifnarch s390 s390x %{arm}
Thanks.
Full change:
============
commit c733a4a7c5a527f96db645c9da41590ed3e71789
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 12:55:19 2017 -0700
Disable libibverbs support on 32-bit ARM (#1484155)
diff --git a/hwloc.spec b/hwloc.spec
index d138fcc..e013310 100644
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -1,7 +1,7 @@
Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures
Name: hwloc
Version: 1.11.5
-Release: 4%{?dist}
+Release: 5%{?dist}
License: BSD
Group: Applications/System
URL: http://www.open-mpi.org/projects/hwloc/
@@ -19,11 +19,9 @@ BuildRequires: transfig doxygen w3m
BuildRequires: texlive-latex texlive-makeindex
BuildRequires: autoconf automake libtool
BuildRequires: desktop-file-utils
-%ifnarch s390 s390x
-BuildRequires: libibverbs-devel
-%endif
%ifnarch s390 s390x %{arm}
BuildRequires: numactl-devel
+BuildRequires: libibverbs-devel
%endif
%description
@@ -44,7 +42,7 @@ about the hardware, bind processes, and much more.
Summary: Headers and shared development libraries for hwloc
Group: Development/Libraries
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%ifnarch s390 s390x
+%ifnarch s390 s390x %{arm}
Requires: libibverbs-devel%{?_isa}
%endif
@@ -150,6 +148,9 @@ make check
%{_libdir}/hwloc*
%changelog
+* Wed Aug 23 2017 Adam Williamson <awilliam(a)redhat.com> - 1.11.5-5
+- Disable libibverbs support on 32-bit ARM (#1484155)
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.11.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 8 months
Architecture specific change in rpms/hwloc.git
by githook-noreply@fedoraproject.org
The package rpms/hwloc.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/hwloc.git/commit/?id=c733a4a7c5a5....
Change:
+%ifnarch s390 s390x %{arm}
Thanks.
Full change:
============
commit c733a4a7c5a527f96db645c9da41590ed3e71789
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 12:55:19 2017 -0700
Disable libibverbs support on 32-bit ARM (#1484155)
diff --git a/hwloc.spec b/hwloc.spec
index d138fcc..e013310 100644
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -1,7 +1,7 @@
Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures
Name: hwloc
Version: 1.11.5
-Release: 4%{?dist}
+Release: 5%{?dist}
License: BSD
Group: Applications/System
URL: http://www.open-mpi.org/projects/hwloc/
@@ -19,11 +19,9 @@ BuildRequires: transfig doxygen w3m
BuildRequires: texlive-latex texlive-makeindex
BuildRequires: autoconf automake libtool
BuildRequires: desktop-file-utils
-%ifnarch s390 s390x
-BuildRequires: libibverbs-devel
-%endif
%ifnarch s390 s390x %{arm}
BuildRequires: numactl-devel
+BuildRequires: libibverbs-devel
%endif
%description
@@ -44,7 +42,7 @@ about the hardware, bind processes, and much more.
Summary: Headers and shared development libraries for hwloc
Group: Development/Libraries
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%ifnarch s390 s390x
+%ifnarch s390 s390x %{arm}
Requires: libibverbs-devel%{?_isa}
%endif
@@ -150,6 +148,9 @@ make check
%{_libdir}/hwloc*
%changelog
+* Wed Aug 23 2017 Adam Williamson <awilliam(a)redhat.com> - 1.11.5-5
+- Disable libibverbs support on 32-bit ARM (#1484155)
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.11.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 8 months
Architecture specific change in rpms/libfabric.git
by githook-noreply@fedoraproject.org
The package rpms/libfabric.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/libfabric.git/commit/?id=b100e55c....
Change:
+%ifnarch %{arm}
Thanks.
Full change:
============
commit b100e55c79e12f39f33d629b2cbe44a3b48aeb51
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 12:41:11 2017 -0700
Disable RDMA support on 32-bit ARM (#1484155)
diff --git a/libfabric.spec b/libfabric.spec
index 2271a72..30c8233 100644
--- a/libfabric.spec
+++ b/libfabric.spec
@@ -1,15 +1,18 @@
Name: libfabric
Version: 1.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Open Fabric Interfaces
License: BSD or GPLv2
URL: http://ofiwg.github.io/libfabric/
Source0: https://github.com/ofiwg/libfabric/releases/download/v%{version}/libfabri...
-BuildRequires: libibverbs-devel
BuildRequires: libnl3-devel
+# RDMA not available on 32-bit ARM: #1484155
+%ifnarch %{arm}
+BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel
+%endif
%ifarch x86_64
%if 0%{?fedora} || 0%{?rhel} >= 6
BuildRequires: infinipath-psm-devel
@@ -81,6 +84,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%changelog
+* Wed Aug 23 2017 Adam Williamson <awilliam(a)redhat.com> - 1.4.2-5
+- Disable RDMA support on 32-bit ARM (#1484155)
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 8 months
Architecture specific change in rpms/libfabric.git
by githook-noreply@fedoraproject.org
The package rpms/libfabric.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/libfabric.git/commit/?id=b100e55c....
Change:
+%ifnarch %{arm}
Thanks.
Full change:
============
commit b100e55c79e12f39f33d629b2cbe44a3b48aeb51
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 23 12:41:11 2017 -0700
Disable RDMA support on 32-bit ARM (#1484155)
diff --git a/libfabric.spec b/libfabric.spec
index 2271a72..30c8233 100644
--- a/libfabric.spec
+++ b/libfabric.spec
@@ -1,15 +1,18 @@
Name: libfabric
Version: 1.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Open Fabric Interfaces
License: BSD or GPLv2
URL: http://ofiwg.github.io/libfabric/
Source0: https://github.com/ofiwg/libfabric/releases/download/v%{version}/libfabri...
-BuildRequires: libibverbs-devel
BuildRequires: libnl3-devel
+# RDMA not available on 32-bit ARM: #1484155
+%ifnarch %{arm}
+BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel
+%endif
%ifarch x86_64
%if 0%{?fedora} || 0%{?rhel} >= 6
BuildRequires: infinipath-psm-devel
@@ -81,6 +84,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%changelog
+* Wed Aug 23 2017 Adam Williamson <awilliam(a)redhat.com> - 1.4.2-5
+- Disable RDMA support on 32-bit ARM (#1484155)
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 8 months