The package rpms/arpack.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/arpack.git/commit/?id=772f78a2187....
Change:
-%ifnarch %{openblas_arches}
Thanks.
Full change:
============
commit 5ebfa49f6c6888f2f4973981769b33111623f1ea
Merge: 44fd8c4 0542557
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Sep 3 00:18:15 2021 +0200
Merge branch 'f34' into f35
diff --cc arpack.spec
index e9566d6,f6fe904..8200b85
--- a/arpack.spec
+++ b/arpack.spec
@@@ -20,7 -8,7 +8,7 @@@
Name: arpack
Version: 3.8.0
--Release: 2%{dist}
++Release: 3%{dist}
Summary: Fortran 77 subroutines for solving large scale eigenvalue problems
License: BSD
@@@ -192,9 -159,11 +159,14 @@@ pop
%changelog
-* Thu Sep 02 2021 Dominik Mierzejewski <rpm(a)greysector.net> - 3.8.0-2
++* Thu Sep 02 2021 Dominik Mierzejewski <rpm(a)greysector.net> - 3.8.0-3
+ - ensure arpackicb.h is installed (#1990366)
+ - spec clean-up: drop support for building with other blas libs on F34+
+ - drop obsolete ldconfig scriptlet macro
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.8.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Wed Jun 02 2021 Dominik Mierzejewski <rpm(a)greysector.net> - 3.8.0-1
- update to 3.8.0 (#1905263)
- drop obsolete patches
commit 0542557e9f9b64415748426ef2821fd079a198ee
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Sep 3 00:14:23 2021 +0200
cosmetics: use tabs consistently
diff --git a/arpack.spec b/arpack.spec
index 97fc231..f6fe904 100644
--- a/arpack.spec
+++ b/arpack.spec
@@ -19,9 +19,9 @@ Patch0: arpack-install-arpackicb_h.patch
BuildRequires: gcc-c++
BuildRequires: gcc-gfortran
-BuildRequires: pkgconfig(flexiblas)
+BuildRequires: pkgconfig(flexiblas)
BuildRequires: libtool >= 2.4.2
-BuildRequires: make
+BuildRequires: make
Provides: arpack-ng = %{version}-%{release}
Provides: arpack-ng%{?_isa} = %{version}-%{release}
commit 2be8779660e0f6d7b3d174a6ea82212f56a75485
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Sep 3 00:13:22 2021 +0200
drop obsolete ldconfig scriptlet macro
diff --git a/arpack.spec b/arpack.spec
index daec011..97fc231 100644
--- a/arpack.spec
+++ b/arpack.spec
@@ -126,8 +126,6 @@ pushd EXAMPLES ; make clean ; popd
popd
%endif
-%ldconfig_scriptlets
-
%files
%doc src/CHANGES src/README.md
%license src/COPYING
@@ -164,6 +162,7 @@ popd
* Thu Sep 02 2021 Dominik Mierzejewski <rpm(a)greysector.net> - 3.8.0-2
- ensure arpackicb.h is installed (#1990366)
- spec clean-up: drop support for building with other blas libs on F34+
+- drop obsolete ldconfig scriptlet macro
* Wed Jun 02 2021 Dominik Mierzejewski <rpm(a)greysector.net> - 3.8.0-1
- update to 3.8.0 (#1905263)
commit 5a077ec10ffb7e104eede99c00dc70411267aa56
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Sep 3 00:12:14 2021 +0200
drop obsolete comment
diff --git a/arpack.spec b/arpack.spec
index 753cadb..daec011 100644
--- a/arpack.spec
+++ b/arpack.spec
@@ -113,7 +113,6 @@ popd
%endif
# Get rid of .la files
rm -r %{buildroot}%{_libdir}/*.la
-# Get rid of generic file names (
https://github.com/opencollab/arpack-ng/issues/130)
%check
pushd src
commit 0558bd5ddf972ff56d4a122fb6edb8953995bf65
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Sep 3 00:10:21 2021 +0200
remove now pointless macro for blas library
diff --git a/arpack.spec b/arpack.spec
index 4acbc79..753cadb 100644
--- a/arpack.spec
+++ b/arpack.spec
@@ -83,11 +83,10 @@ cp -pr src src64
%build
-%global blaslib -lflexiblas
pushd src
%configure --enable-shared --enable-static \
- --with-blas="%{blaslib}" \
- --with-lapack="%{blaslib}" \
+ --with-blas=-lflexiblas \
+ --with-lapack=-lflexiblas \
--enable-icb
%make_build
popd
@@ -96,8 +95,8 @@ pushd src64
%configure --enable-shared --enable-static \
LIBSUFFIX=64 \
INTERFACE64=1 \
- --with-blas=%{blaslib}64 \
- --with-lapack=%{blaslib}64 \
+ --with-blas=-lflexiblas64 \
+ --with-lapack=-lflexiblas64 \
--enable-icb
%make_build
popd
commit 772f78a218798dc6c18524fd6e13118ab95c80a6
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Sep 3 00:08:33 2021 +0200
drop support for building with other blas libs on F34+
diff --git a/arpack.spec b/arpack.spec
index a2f2438..4acbc79 100644
--- a/arpack.spec
+++ b/arpack.spec
@@ -1,19 +1,7 @@
%global build64 0
-%if 0%{?fedora} >= 26 || 0%{?rhel} >= 7
-%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
-%ifnarch %{openblas_arches}
-# matches openblas ExclusiveArch
-%bcond_without atlas
-%else
%if 0%{?__isa_bits} == 64
%global build64 1
%endif
-%endif
-%endif
-
-%if 0%{?fedora} >= 33
-%bcond_without flexiblas
-%endif
# We are linking FORTRAN symbols. Thus we cannot link --as-needed.
%undefine _ld_as_needed
@@ -31,15 +19,7 @@ Patch0: arpack-install-arpackicb_h.patch
BuildRequires: gcc-c++
BuildRequires: gcc-gfortran
-%if %{with flexiblas}
BuildRequires: pkgconfig(flexiblas)
-%else
-%if %{with atlas}
-BuildRequires: atlas-devel
-%else
-BuildRequires: openblas-devel
-%endif
-%endif
BuildRequires: libtool >= 2.4.2
BuildRequires: make
Provides: arpack-ng = %{version}-%{release}
@@ -103,19 +83,7 @@ cp -pr src src64
%build
-%if %{with flexiblas}
%global blaslib -lflexiblas
-%else
-%if %{with atlas}
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%global blaslib -L%{_libdir}/atlas -ltatlas
-%else
-%global blaslib -L%{_libdir}/atlas -lf77blas -latlas
-%endif
-%else
-%global blaslib -lopenblasp
-%endif
-%endif
pushd src
%configure --enable-shared --enable-static \
--with-blas="%{blaslib}" \
@@ -197,6 +165,7 @@ popd
%changelog
* Thu Sep 02 2021 Dominik Mierzejewski <rpm(a)greysector.net> - 3.8.0-2
- ensure arpackicb.h is installed (#1990366)
+- spec clean-up: drop support for building with other blas libs on F34+
* Wed Jun 02 2021 Dominik Mierzejewski <rpm(a)greysector.net> - 3.8.0-1
- update to 3.8.0 (#1905263)
commit 7f28de9c36b3af1982daf608d768fe79ac307bbc
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Sep 3 00:03:58 2021 +0200
ensure arpackicb.h is installed (#1990366)
diff --git a/arpack-install-arpackicb_h.patch b/arpack-install-arpackicb_h.patch
new file mode 100644
index 0000000..ef2757b
--- /dev/null
+++ b/arpack-install-arpackicb_h.patch
@@ -0,0 +1,12 @@
+diff -up src/Makefile.am.icb src/Makefile.am
+--- src/Makefile.am.icb 2020-12-07 11:40:45.000000000 +0100
++++ src/Makefile.am 2021-09-02 23:55:29.346733967 +0200
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+
+ pkgincludedir = $(includedir)/arpack
+-pkginclude_HEADERS = debug.h stat.h arpackdef.h
++pkginclude_HEADERS = debug.h stat.h arpackdef.h arpackicb.h
+
+ AM_DISTCHECK_CONFIGURE_FLAGS =
+ if MPI
diff --git a/arpack.spec b/arpack.spec
index 7fe6629..a2f2438 100644
--- a/arpack.spec
+++ b/arpack.spec
@@ -20,12 +20,14 @@
Name: arpack
Version: 3.8.0
-Release: 1%{dist}
+Release: 2%{dist}
Summary: Fortran 77 subroutines for solving large scale eigenvalue problems
License: BSD
URL:
https://github.com/opencollab/arpack-ng
Source0:
https://github.com/opencollab/arpack-ng/archive/%{version}/arpack-ng-%{ve...
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1990366
+Patch0: arpack-install-arpackicb_h.patch
BuildRequires: gcc-c++
BuildRequires: gcc-gfortran
@@ -92,6 +94,7 @@ library and so links used for building arpack based applications.
%setup -qc
mv arpack-ng-%{version} src
pushd src
+%patch0 -p1
autoreconf -vif
popd
%if %{build64}
@@ -192,6 +195,9 @@ popd
%changelog
+* Thu Sep 02 2021 Dominik Mierzejewski <rpm(a)greysector.net> - 3.8.0-2
+- ensure arpackicb.h is installed (#1990366)
+
* Wed Jun 02 2021 Dominik Mierzejewski <rpm(a)greysector.net> - 3.8.0-1
- update to 3.8.0 (#1905263)
- drop obsolete patches