Fixed license tag

Resolves: rhbz#2346827
2025-03-12 16:35:09 +01:00
3 changed files with 18 additions and 61 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,5 +6,3 @@
 /volk-3.1.0.tar.gz.asc
 /volk-3.1.1.tar.gz.asc
 /volk-3.1.2.tar.gz.asc
-/volk-3.2.0.tar.gz.asc
-/volk-3.3.0.tar.gz.asc
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (volk-3.3.0.tar.gz) = 6a10a3eb33ecfbf61c87a41ae41013a297d41ec5a5fee3e0a2c4c2a82564aacce24532d32fb90e07b10abb3c2aefdfb8fb48226fc6d16bfe7f93f7f7b8a69e56
-SHA512 (volk-3.3.0.tar.gz.asc) = 8f09a655e429ef2fff3fd78fbd6f89363ae6d7c9bd8ec8cbb02604b008d83735d6c8d710248662056b9112f71b27f1d1f3202ba8ee78c15149b12cabb4e603ab
+SHA512 (volk-3.1.2.tar.gz) = b6ed1cb6ddc9732ec4c5cd0a31a8bc4de838da06d347ce848fcbe5ec56365b9547c03ec0bddbe686847067eb35520287f9405e66a547a292eb4b193afb541cf7
+SHA512 (volk-3.1.2.tar.gz.asc) = 9e70e8ea929eb32256629d123da8ac895796581d7dba4a7a11e360f74ea32c36b33e5d15d9c5354c971cfe6652e98fd2d3023f75a4cacc3898e72c887e8494bc
--- a/volk.spec
+++ b/volk.spec
@ -1,6 +1,6 @@
 Name:          volk
-Version:       3.3.0
-Release:       5%{?dist}
+Version:       3.1.2
+Release:       4%{?dist}
 Summary:       The Vector Optimized Library of Kernels
 License:       LGPL-3.0-or-later
 URL:           https://github.com/gnuradio/%{name}
@ -16,7 +16,6 @@ BuildRequires: gcc-c++
 BuildRequires: python3-devel
 BuildRequires: python3-mako
 BuildRequires: orc-devel
-BuildRequires: fmt-devel
 BuildRequires: sed
 %ifnarch s390x
 BuildRequires: google-cpu_features-devel
@ -65,13 +64,22 @@ sed -i '1 {/#!\s*\/usr\/bin\/env\s\+python/ d}' __init__.py cfg.py
 popd

 %build
+# workaround, the code is not yet compatible with the strict-aliasing
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+export CXXFLAGS="$CFLAGS"
 %cmake
 %cmake_build
-%cmake_build -t volk_doc

-%check
-cd %{__cmake_builddir}
-ctest --output-on-failure
+# Use make_build for EL8 compat
+%make_build -C %{__cmake_builddir} volk_doc
+
+
+# temporally disabled the testsuite due to https://github.com/gnuradio/volk/issues/442
+# gnuradio (and all volk consumers) could coredump on s390x and ppc64le under some
+# circumstances, see https://bugzilla.redhat.com/show_bug.cgi?id=1917625#c6
+#%%check
+#cd %{__cmake_builddir}
+#make test


 %install
@ -103,59 +111,10 @@ cp -a %{__cmake_builddir}/html %{buildroot}%{_docdir}/%{name}


 %changelog
-* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 3.3.0-5
- Rebuilt for Python 3.15.0b4 ABI change
-
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Thu Jun 25 2026 František Zatloukal <fzatlouk@redhat.com> - 3.3.0-3
- Rebuilt for fmt/spdlog
-
-* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 3.3.0-2
- Rebuilt for Python 3.15
-
-* Mon Feb 09 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 3.3.0-1
- New version
-  Resolves: rhbz#2437661
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Sep 26 2025 Antonio Trande <sagitter@fedoraproject.org> - 3.2.0-8
- Rebuild for google-cpu_features-0.10.1
-
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 3.2.0-7
- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 3.2.0-6
- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Fri Jul 25 2025 Fedora Release Engineering <marcus_fedora@baseband.digital> - 3.2.0-5
- Enable tests
- Disable rotator2 SSE 4.1 kernels (other implementations available)
- Use default compiler flags (strict aliasing works)
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 3.2.0-3
- Rebuilt for Python 3.14
-
-* Wed Mar 12 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 3.2.0-2
+* Wed Mar 12 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 3.1.2-4
 - Fixed license tag
  Resolves: rhbz#2346827

-* Mon Mar 10 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 3.2.0-1
- New version
-  Resolves: rhbz#2343664
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
 * Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 3.1.2-3
 - Rebuilt for Python 3.13