The package rpms/fftw.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/fftw.git/commit/?id=a54e4347e9c68...
https://src.fedoraproject.org/cgit/rpms/fftw.git/commit/?id=41a48b56e573f....
Change:
+%ifarch s390 s390x
+%ifarch s390 s390x %{ix86}
Thanks.
Full change:
============
commit a54e4347e9c68740445115805715b76866712988
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Jan 22 14:22:28 2024 +0000
Disable mpich on s390x to fix the build
diff --git a/fftw.spec b/fftw.spec
index 0a7fa56..5afdee5 100644
--- a/fftw.spec
+++ b/fftw.spec
@@ -2,7 +2,12 @@
%bcond_with mpich
%bcond_with openmpi
%else
+# TODO check later if we can enable mpich on s390x
+%ifarch s390 s390x
+%bcond_with mpich
+%else
%bcond_without mpich
+%endif
%ifarch s390 s390x %{ix86}
%bcond_with openmpi
%else
@@ -542,7 +547,8 @@ done
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
- Fix i686 build by disabling openmpi
- Fix "The file FFTW3LibraryDepends.cmake is missing" in autotools build
-
https://github.com/FFTW/fftw3/issues/130#issuecomment-1902748460
+
https://github.com/FFTW/fftw3/issues/130#issuecomment-1902748460 (#2193075)
+- Disable mpich on s390x to fix the build
* Thu Jul 27 2023 Lukáš Zaoral <lzaoral(a)redhat.com> - 3.3.10-9
- migrate to SPDX license format
commit eacf254206c5b7b2ac562b0d27e4713b2dc226aa
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jan 21 20:25:42 2024 +0000
Fix "The file FFTW3LibraryDepends.cmake is missing" in autotools build
https://github.com/FFTW/fftw3/issues/130#issuecomment-1902748460
diff --git a/fftw.spec b/fftw.spec
index 19f88b0..0a7fa56 100644
--- a/fftw.spec
+++ b/fftw.spec
@@ -24,6 +24,7 @@ Summary: A Fast Fourier Transform library
License: GPL-2.0-or-later AND MIT AND BSD-2-Clause
URL:
http://www.fftw.org
Source0:
http://www.fftw.org/fftw-%{version}.tar.gz
+Patch1: fix_autotools_build.patch
BuildRequires: gcc-gfortran
@@ -280,7 +281,7 @@ This package contains the manual for the FFTW fast Fourier transform
library.
%prep
-%setup -q
+%autosetup -p1
%build
%if %{with mpich} || %{with openmpi}
@@ -540,6 +541,8 @@ done
* Fri Jan 19 2024 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.3.10-10
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
- Fix i686 build by disabling openmpi
+- Fix "The file FFTW3LibraryDepends.cmake is missing" in autotools build
+
https://github.com/FFTW/fftw3/issues/130#issuecomment-1902748460
* Thu Jul 27 2023 Lukáš Zaoral <lzaoral(a)redhat.com> - 3.3.10-9
- migrate to SPDX license format
diff --git a/fix_autotools_build.patch b/fix_autotools_build.patch
new file mode 100644
index 0000000..7bc7696
--- /dev/null
+++ b/fix_autotools_build.patch
@@ -0,0 +1,13 @@
+diff --git a/FFTW3Config.cmake.in b/FFTW3Config.cmake.in
+index 6b1fbc2..e8a2ed8 100644
+--- a/FFTW3Config.cmake.in
++++ b/FFTW3Config.cmake.in
+@@ -10,8 +10,6 @@ set (FFTW3@PREC_SUFFIX@_LIBRARIES fftw3@PREC_SUFFIX@)
+ set (FFTW3@PREC_SUFFIX@_LIBRARY_DIRS @CMAKE_INSTALL_FULL_LIBDIR@)
+ set (FFTW3@PREC_SUFFIX@_INCLUDE_DIRS @CMAKE_INSTALL_FULL_INCLUDEDIR@)
+
+-include ("${CMAKE_CURRENT_LIST_DIR}/FFTW3LibraryDepends.cmake")
+-
+ if (CMAKE_VERSION VERSION_LESS 2.8.3)
+ set (CMAKE_CURRENT_LIST_DIR)
+ endif ()
commit 41a48b56e573f38d18adc5bee9f235a67598ec02
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jan 21 20:15:56 2024 +0000
Fix i686 build by disabling openmpi
diff --git a/fftw.spec b/fftw.spec
index c836084..19f88b0 100644
--- a/fftw.spec
+++ b/fftw.spec
@@ -3,7 +3,7 @@
%bcond_with openmpi
%else
%bcond_without mpich
-%ifarch s390 s390x
+%ifarch s390 s390x %{ix86}
%bcond_with openmpi
%else
%bcond_without openmpi
@@ -539,6 +539,7 @@ done
%changelog
* Fri Jan 19 2024 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.3.10-10
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+- Fix i686 build by disabling openmpi
* Thu Jul 27 2023 Lukáš Zaoral <lzaoral(a)redhat.com> - 3.3.10-9
- migrate to SPDX license format
commit f5b38f9062890839571de7b6e9cc40814cd328bc
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 19 19:15:39 2024 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/fftw.spec b/fftw.spec
index 8089dfa..c836084 100644
--- a/fftw.spec
+++ b/fftw.spec
@@ -18,7 +18,7 @@
Name: fftw
Version: 3.3.10
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: A Fast Fourier Transform library
# Generally, the code is under GPL but some headers are also under MIT or BSD:
License: GPL-2.0-or-later AND MIT AND BSD-2-Clause
@@ -537,6 +537,9 @@ done
%endif
%changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.3.10-10
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
* Thu Jul 27 2023 Lukáš Zaoral <lzaoral(a)redhat.com> - 3.3.10-9
- migrate to SPDX license format
commit 1f685fa2628e8eb660e945acb14daf5b20f9dbb4
Merge: b648ec9 67ae267
Author: David Cantrell <dcantrell(a)redhat.com>
Date: Mon Aug 21 14:47:38 2023 +0000
Merge #11 `migrate to SPDX license format`
commit 67ae267b1392e19506b3970d3dd3d606f546ce72
Author: Lukáš Zaoral <lzaoral(a)redhat.com>
Date: Thu Jul 27 13:10:12 2023 +0200
migrate to SPDX license format
diff --git a/fftw.spec b/fftw.spec
index 83ff5b4..355e204 100644
--- a/fftw.spec
+++ b/fftw.spec
@@ -13,9 +13,10 @@
Name: fftw
Version: 3.3.10
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A Fast Fourier Transform library
-License: GPLv2+
+# Generally, the code is under GPL but some headers are also under MIT or BSD:
+License: GPL-2.0-or-later AND MIT AND BSD-2-Clause
URL:
http://www.fftw.org
Source0:
http://www.fftw.org/fftw-%{version}.tar.gz
@@ -525,6 +526,9 @@ done
%endif
%changelog
+* Thu Jul 27 2023 Lukáš Zaoral <lzaoral(a)redhat.com> - 3.3.10-9
+- migrate to SPDX license format
+
* Wed Jul 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.3.10-8
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild