The package rpms/mlpack.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/mlpack.git/commit/?id=e801d88a42f....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 31907ee026cd18690a7c341e60af5786ab639c54
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mon Aug 23 19:36:05 2021 -0400
Simplify stb unbundling
See discussion at
https://src.fedoraproject.org/rpms/CuraEngine/pull-request/15.
diff --git a/mlpack.spec b/mlpack.spec
index b48538e..41badd0 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,6 +1,6 @@
Name: mlpack
Version: 3.4.2
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Scalable, fast C++ machine learning library
License: BSD
@@ -141,9 +141,6 @@ margins. This package provides the Python bindings for mlpack.
%prep
%autosetup -p1
-mkdir stb/;
-ln -s %{_includedir}/stb_image.h %{_includedir}/stb_image_write.h stb/
-
# Disable Doxygen warnings being fatal.
sed -i 's/WARN_AS_ERROR = YES/WARN_AS_ERROR = NO/' Doxyfile;
@@ -152,9 +149,9 @@ sed -i 's/WARN_AS_ERROR = YES/WARN_AS_ERROR = NO/'
Doxyfile;
# On RHEL6, the Boost CMake scripts fail for some reason. I don't have the
# time (or patience) to investigate, but if we force CMake to find Boost "the
# hard way" by specifying Boost_NO_BOOST_CMAKE=1, it works.
-%{cmake28} -D Boost_NO_BOOST_CMAKE=1 -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D
PROFILE=OFF -D BUILD_TESTS=OFF -D BUILD_PYTHON_BINDINGS=ON -D PYTHON_EXECUTABLE=$(which
python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D
STB_IMAGE_INCLUDE_DIR=stb/
+%{cmake28} -D Boost_NO_BOOST_CMAKE=1 -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D
PROFILE=OFF -D BUILD_TESTS=OFF -D BUILD_PYTHON_BINDINGS=ON -D PYTHON_EXECUTABLE=$(which
python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D
STB_IMAGE_INCLUDE_DIR=%{_includedir}
%else
-%{cmake} -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D
BUILD_TESTS=OFF -D BUILD_PYTHON_BINDINGS=ON -D PYTHON_EXECUTABLE=$(which python3) -D
BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D STB_IMAGE_INCLUDE_DIR=stb/
+%{cmake} -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D
BUILD_TESTS=OFF -D BUILD_PYTHON_BINDINGS=ON -D PYTHON_EXECUTABLE=$(which python3) -D
BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D STB_IMAGE_INCLUDE_DIR=%{_includedir}
%endif
# Try and reduce RAM usage.
@@ -312,6 +309,9 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%{python3_sitearch}/mlpack-*.egg-info
%changelog
+* Mon Aug 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 3.4.2-11
+- Simplify stb unbundling
+
* Mon Aug 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 3.4.2-10
- Unbundle stb_image.h/stb_image_write.h
commit 56db5baed46387ff0a0e4e9976cc127bdcde895c
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mon Aug 23 11:27:03 2021 -0400
Unbundle stb_image.h/stb_image_write.h
diff --git a/mlpack.spec b/mlpack.spec
index 961a7ef..b48538e 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,13 +1,11 @@
Name: mlpack
Version: 3.4.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Scalable, fast C++ machine learning library
License: BSD
URL:
http://www.mlpack.org
Source0:
http://www.mlpack.org/files/%{name}-%{version}.tar.gz
-Source1:
http://www.mlpack.org/files/stb_image.h
-Source2:
http://www.mlpack.org/files/stb_image_write.h
# By default the mlpack Doxyfile excludes all files in the directory pattern
# */build/*. Well, on Koji, that's everything. So we need to not exclude
@@ -34,6 +32,12 @@ BuildRequires: ensmallen-devel >= 2.10.0
BuildRequires: boost-devel, cli11-devel, boost-math, boost-serialization >= 1.49
BuildRequires: pkg-config
+# Header-only librarires (-static is for tracking per guidelines)
+BuildRequires: stb_image-devel
+BuildRequires: stb_image-static
+BuildRequires: stb_image_write-devel
+BuildRequires: stb_image_write-static
+
# For generating man pages (CMake configuration takes care of this assuming
# txt2man is installed). It is possible that we could just add all the man
# pages, generated offline, as a patch to this SRPM, but txt2man seems to exist
@@ -86,6 +90,8 @@ Requires: boost-devel, boost-program-options, boost-math
Requires: libxml2-devel
Requires: lapack-devel
Requires: pkg-config
+Requires: stb_image-devel%{?_isa}
+Requires: stb_image_write-devel%{?_isa}
%description devel
mlpack is a C++ machine learning library with emphasis on scalability, speed,
@@ -136,8 +142,7 @@ margins. This package provides the Python bindings for mlpack.
%autosetup -p1
mkdir stb/;
-cp %SOURCE1 stb/;
-cp %SOURCE2 stb/;
+ln -s %{_includedir}/stb_image.h %{_includedir}/stb_image_write.h stb/
# Disable Doxygen warnings being fatal.
sed -i 's/WARN_AS_ERROR = YES/WARN_AS_ERROR = NO/' Doxyfile;
@@ -175,9 +180,6 @@ cd ..;
%install
%{cmake_install}
-cp stb/stb_image.h $RPM_BUILD_ROOT/%{_includedir}/;
-cp stb/stb_image_write.h $RPM_BUILD_ROOT/%{_includedir}/;
-
# Put the license file and documentation in place.
if [ "%{our_docdir}" != "%{_docdir}/mlpack" ]; then
mv $RPM_BUILD_ROOT/%{_docdir}/mlpack $RPM_BUILD_ROOT/%{our_docdir}
@@ -297,8 +299,6 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%{_libdir}/libmlpack.so
%{_includedir}/mlpack/
%{_libdir}/pkgconfig/mlpack.pc
-%{_includedir}/stb_image.h
-%{_includedir}/stb_image_write.h
%{_libdir}/cmake/mlpack/mlpack-config-version.cmake
%{_libdir}/cmake/mlpack/mlpack-config.cmake
%{_libdir}/cmake/mlpack/mlpack-targets-noconfig.cmake
@@ -312,6 +312,9 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%{python3_sitearch}/mlpack-*.egg-info
%changelog
+* Mon Aug 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 3.4.2-10
+- Unbundle stb_image.h/stb_image_write.h
+
* Fri Aug 13 2021 Ryan Curtin <ryan(a)ratml.org> - 3.4.2-9
- Rebuilt for CLI 2.0.0.
commit 283542e023be343183d0bb3cb1e55f0119578f50
Author: Ryan Curtin <ryan(a)ratml.org>
Date: Fri Aug 13 14:18:31 2021 +0000
Bump release for CLI 2.0.0 rebuild.
diff --git a/mlpack.spec b/mlpack.spec
index 8cae31b..961a7ef 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,6 +1,6 @@
Name: mlpack
Version: 3.4.2
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Scalable, fast C++ machine learning library
License: BSD
@@ -312,6 +312,9 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%{python3_sitearch}/mlpack-*.egg-info
%changelog
+* Fri Aug 13 2021 Ryan Curtin <ryan(a)ratml.org> - 3.4.2-9
+- Rebuilt for CLI 2.0.0.
+
* Sat Aug 07 2021 Jonathan Wakely <jwakely(a)redhat.com> - 3.4.2-8
- Rebuilt for Boost 1.76
commit 79a79d3bf03710b90e7d323957130c000b95237b
Author: Jonathan Wakely <jwakely(a)redhat.com>
Date: Sat Aug 7 01:01:45 2021 +0100
Rebuilt for Boost 1.76
diff --git a/mlpack.spec b/mlpack.spec
index f316510..8cae31b 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,6 +1,6 @@
Name: mlpack
Version: 3.4.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Scalable, fast C++ machine learning library
License: BSD
@@ -312,6 +312,9 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%{python3_sitearch}/mlpack-*.egg-info
%changelog
+* Sat Aug 07 2021 Jonathan Wakely <jwakely(a)redhat.com> - 3.4.2-8
+- Rebuilt for Boost 1.76
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.2-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
commit 4e53afd041458905416b4ec2ba47886fa9b98d89
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 22 15:07:09 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/mlpack.spec b/mlpack.spec
index 46bb5d2..f316510 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,6 +1,6 @@
Name: mlpack
Version: 3.4.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Scalable, fast C++ machine learning library
License: BSD
@@ -312,6 +312,9 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%{python3_sitearch}/mlpack-*.egg-info
%changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.2-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 3.4.2-6
- Rebuilt for Python 3.10
commit 92fad8b5f955f531c9f32e218d35bba4c640b89a
Author: Python Maint <python-maint(a)redhat.com>
Date: Fri Jun 4 20:11:56 2021 +0200
Rebuilt for Python 3.10
diff --git a/mlpack.spec b/mlpack.spec
index 6c957f6..46bb5d2 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,6 +1,6 @@
Name: mlpack
Version: 3.4.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Scalable, fast C++ machine learning library
License: BSD
@@ -312,6 +312,9 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%{python3_sitearch}/mlpack-*.egg-info
%changelog
+* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 3.4.2-6
+- Rebuilt for Python 3.10
+
* Mon Feb 15 2021 Ryan Curtin <ryan(a)ratml.org> - 3.4.2-5
- Disable s390x build due to memory usage concerns.
commit e801d88a42f3cbd420833b892cc639d82526cefd
Author: Ryan Curtin <ryan(a)ratml.org>
Date: Mon Feb 15 18:04:08 2021 +0000
Exclude s390x builds.
diff --git a/mlpack.spec b/mlpack.spec
index 250960a..6c957f6 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,6 +1,6 @@
Name: mlpack
Version: 3.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Scalable, fast C++ machine learning library
License: BSD
@@ -50,6 +50,9 @@ BuildRequires: python-rpm-macros
# something doesn't like size_t being unsigned long on s390
ExcludeArch: s390
+# The s390x builders don't currently have enough RAM to build mlpack.
+# (Check again for mlpack 4.0, which should require much less RAM.)
+ExcludeArch: s390x
%description
mlpack is a C++ machine learning library with emphasis on scalability, speed,
@@ -309,6 +312,9 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
%{python3_sitearch}/mlpack-*.egg-info
%changelog
+* Mon Feb 15 2021 Ryan Curtin <ryan(a)ratml.org> - 3.4.2-5
+- Disable s390x build due to memory usage concerns.
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.2-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild