Enable riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -2,3 +2,5 @@
 /volk-2.5.0.tar.gz.asc
 /volk-2.5.1.tar.gz.asc
 /volk-2.5.2.tar.gz.asc
+/volk-3.0.0.tar.gz.asc
+/volk-3.1.0.tar.gz.asc

sources

@@ -1,2 +1,2 @@
-SHA512 (volk-2.5.2.tar.gz) = 1e29fd8ce4b49c5192b37c50308bd3851a7409f91eaf40c2a6183dca400d71248a828b4ba4137e636639eea8c67ccb8a27699e7ce2f8a61b9360f173b07f6204
-SHA512 (volk-2.5.2.tar.gz.asc) = a27343ad9af535c37f7b5c5274b911f0c4639d72148cbeac74678d5ca22cc797b2fd8ee2ac6947952dbc16a8b7a0326af5634ca5e96e00d53de81931f82496cb
+SHA512 (volk-3.1.0.tar.gz) = a001ba2e13ca70b032e6cb0bde8389da44c89ffa538339313a7895e8c4ce616fb51ce2b6d8275aa8964ebd7a9029194f81cb1e5cb82030ca8130ebfc43caa905
+SHA512 (volk-3.1.0.tar.gz.asc) = efe64ad5cb9ff8c0ef8734def3856bce1aeabea91cd67373dfb238db4c45cf4f57929e41c41106b39547daa3a312123b9daa6bd0ddd8f73997a4613a1f1373c7

volk.spec

@@ -1,6 +1,6 @@
 Name:          volk
-Version:       2.5.2
-Release:       1%{?dist}
+Version:       3.1.0
+Release:       1.0.riscv64%{?dist}
 Summary:       The Vector Optimized Library of Kernels
 License:       GPLv3+
 URL:           https://github.com/gnuradio/%{name}
@@ -17,6 +17,9 @@ BuildRequires: python3-devel
 BuildRequires: python3-mako
 BuildRequires: orc-devel
 BuildRequires: sed
+%ifnarch s390x riscv64
+BuildRequires: google-cpu_features-devel
+%endif
 Conflicts:     python3-gnuradio < 3.9.0.0
 Conflicts:     gnuradio-devel < 3.9.0.0
 
@@ -35,6 +38,9 @@ Requires:      %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 %{summary}.
+%ifarch s390x
+Conflicts:     google-cpu_features-devel
+%endif
 
 
 %package doc
@@ -82,14 +88,6 @@ export CXXFLAGS="$CFLAGS"
 mkdir -p %{buildroot}%{_docdir}/%{name}
 cp -a %{__cmake_builddir}/html %{buildroot}%{_docdir}/%{name}
 
-# drop list_cpu_features, not needed, just some demo binary,
-# unavailable on s390x, for details see:
-# https://github.com/gnuradio/volk/issues/442#issuecomment-772059840
-rm -f %{buildroot}%{_bindir}/list_cpu_features
-
-# drop static objects
-rm -f %{buildroot}%{_libdir}/libcpu_features.a
-
 %files
 %license COPYING
 %doc README.md docs/CHANGELOG.md
@@ -102,10 +100,6 @@ rm -f %{buildroot}%{_libdir}/libcpu_features.a
 
 %files devel
 %{_includedir}/volk
-%ifnarch s390x
-%{_includedir}/cpu_features
-%{_libdir}/cmake/CpuFeatures
-%endif
 %{_libdir}/libvolk.so
 %{_libdir}/cmake/volk
 %{_libdir}/pkgconfig/*.pc
@@ -116,6 +110,27 @@ rm -f %{buildroot}%{_libdir}/libcpu_features.a
 
 
 %changelog
+* Sun Dec 17 2023 David Abdurachmanov <davidlt@rivosinc.com> - 3.1.0-1.0.riscv64
+- Enable riscv64
+
+* Mon Dec 11 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 3.1.0-1
+- New version
+  Resolves: rhbz#2253664
+
+* Thu Oct 19 2023 Marcus Müller <marcus_fedora@baseband.digital> - 3.0.0-4
+- Depend on system google-cpu_features-devel instead of using the vendored
+- Fixes rhbz#2245047
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 3.0.0-2
+- Rebuilt for Python 3.12
+
+* Thu Jan 19 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.0-1
+- New version
+  Resolves: rhbz#2161009
+
 * Mon Sep  5 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.2-1
 - New version
   Resolves: rhbz#2124323