7 changed files with 60 additions and 187 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,35 +1,2 @@
 /xtl-0.4.4.tar.gz
 /xtl-0.4.7.tar.gz
-/xtl-0.4.13.tar.gz
-/xtl-0.4.14.tar.gz
-/xtl-0.4.15.tar.gz
-/xtl-0.5.3.tar.gz
-/xtl-0.5.4.tar.gz
-/xtl-0.6.0.tar.gz
-/xtl-0.6.1.tar.gz
-/xtl-0.6.2.tar.gz
-/xtl-0.6.3.tar.gz
-/xtl-0.6.4.tar.gz
-/xtl-0.6.5.tar.gz
-/xtl-0.6.6.tar.gz
-/xtl-0.6.7.tar.gz
-/xtl-0.6.8.tar.gz
-/xtl-0.6.11.tar.gz
-/xtl-0.6.12.tar.gz
-/xtl-0.6.13.tar.gz
-/xtl-0.6.15.tar.gz
-/xtl-0.6.16.tar.gz
-/xtl-0.6.17.tar.gz
-/xtl-0.6.18.tar.gz
-/xtl-0.6.19.tar.gz
-/xtl-0.6.20.tar.gz
-/xtl-0.6.21.tar.gz
-/xtl-0.6.23.tar.gz
-/xtl-0.7.2.tar.gz
-/xtl-0.7.3.tar.gz
-/xtl-0.7.4.tar.gz
-/xtl-0.7.5.tar.gz
-/xtl-0.7.6.tar.gz
-/xtl-0.7.7.tar.gz
-/xtl-0.8.0.tar.gz
-/xtl-0.8.1.tar.gz
--- a/.packit.yaml
+++ b/.packit.yaml
@ -1,18 +0,0 @@
-# See the documentation for more information:
-# https://packit.dev/docs/configuration/
---
-jobs:
-  - job: pull_from_upstream
-    trigger: release
-    dist_git_branches:
-      rawhide:
-        fast_forward_merge_into:
-          - fedora-branched
-  - job: koji_build
-    trigger: commit
-    dist_git_branches:
-      - fedora-all
-  - job: bodhi_update
-    trigger: commit
-    dist_git_branches:
-      - fedora-all
--- a/0001-Remove-march-native-flag.patch
+++ b/0001-Remove-march-native-flag.patch
@ -0,0 +1,28 @@
+From bf37aab2b70905fd48ca3a11c92c8ca0e145cc74 Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+Date: Tue, 20 Mar 2018 05:15:08 -0400
+Subject: [PATCH] Remove march=native flag.
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ test/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 259cddc..23b1c5f 100644
+--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
+@@ -23,8 +23,8 @@ include(CheckCXXCompilerFlag)
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
+ 
+ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wunused-parameter -Wextra -Wreorder -Wconversion -Wsign-conversion")
+-    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wunused-parameter -Wextra -Wreorder -Wconversion")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-parameter -Wextra -Wreorder -Wconversion -Wsign-conversion")
+    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-parameter -Wextra -Wreorder -Wconversion")
+     CHECK_CXX_COMPILER_FLAG("-std=c++14" HAS_CPP14_FLAG)
+ 
+     if (HAS_CPP14_FLAG)
+-- 
+2.14.3
+
--- a/README.packit
+++ b/README.packit
@ -1,3 +0,0 @@
-This repository is maintained by packit.
-https://packit.dev/
-The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32.
--- a/118
+++ b/118
@ -1,118 +0,0 @@
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sun Jul 11 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.7.2-2
- Fix build with Sphinx 4
-
-* Sun Feb 07 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.7.2-1
- Update to latest version (#1918520)
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.23-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Dec 12 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.23-1
- Update to latest version (#1906535)
-
-* Thu Oct 29 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.21-1
- Update to latest version (#1892529)
-
-* Fri Oct 16 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.20-1
- Update to latest version (#1888869)
-
-* Sat Sep 26 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.19-1
- Update to latest version (#1881965)
-
-* Thu Sep 03 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.18-1
- Update to latest version (#1875020)
-
-* Sun Aug 30 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.17-1
- Update to latest version (#1873863)
-
-* Thu Aug 13 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.16-1
- Update to latest version (#1867970)
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 21 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.15-1
- Update to latest version
-
-* Sat Mar 14 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.13-1
- Update to latest version
-
-* Fri Feb 14 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.12-2
- Re-enable armv7hl and ppc64le
-
-* Fri Feb 14 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.12-1
- Update to latest version
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jan 08 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.11-1
- Update to latest version
-
-* Thu Oct 31 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.8-1
- Update to latest version
-
-* Mon Sep 23 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.7-1
- Update to latest version
-
-* Wed Sep 18 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.6-1
- Update to latest version
-
-* Tue Aug 27 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.5-1
- Update to latest version
- Exclude arches that don't work
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Apr 29 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.4-1
- Update to latest version
-
-* Wed Apr 10 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.3-1
- Update to latest version
-
-* Sat Apr 06 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.2-1
- Update to latest version
-
-* Tue Mar 26 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.1-1
- Update to latest version
-
-* Fri Mar 08 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.6.0-1
- Update to latest version
-
-* Wed Feb 13 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.5.4-1
- Update to latest version
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jan 23 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.5.3-1
- Update to latest version
-
-* Wed Sep 05 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.4.15-1
- Update to latest version
-
-* Thu Aug 16 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.4.14-2
- rebuilt
-
-* Tue Aug 14 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.4.14-1
- Update to latest version
-
-* Tue Aug 07 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.4.13-1
- Update to latest version
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed May 02 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> 0.4.7-1
- Update to latest version
-
-* Wed Mar 21 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> 0.4.4-2
- Split documentation into subpackage
- Run more tests on broken arches
-
-* Mon Mar 19 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> 0.4.4-1
- Initial package for Fedora
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (xtl-0.8.1.tar.gz) = cb032d27b2f7dff135c442fd92e3924eb108355769354c9eee9ec2d3ec7ebd867ee89ee2e10f41352447e08f185637f338fdc40e37d60d85cf2fffdcaac1ce6c
+SHA512 (xtl-0.4.7.tar.gz) = 624233c436c25995717efd95c361522d415883bd70e19a1c92c77413d049465bca21b4315564f2ea7edf3ae6844a3a78f018d0281a2c73b040b2b7d9685fb1b7
--- a/xtl.spec
+++ b/xtl.spec
@ -2,23 +2,25 @@
 %global debug_package %{nil}

 Name:           xtl
-Version:        0.8.1
-Release:        %autorelease
-License:        BSD-3-Clause
+Version:        0.4.7
+Release:        1%{?dist}
+License:        BSD
 Summary:        QuantStack tools library
 Url:            https://github.com/QuantStack/xtl
 Source0:        https://github.com/QuantStack/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+# Just used in testing, and it breaks on some arches.
+Patch0001:      0001-Remove-march-native-flag.patch

 BuildRequires:  binutils
 BuildRequires:  cmake
-BuildRequires:  doctest-devel
+BuildRequires:  diffutils
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
+BuildRequires:  gtest-devel
 BuildRequires:  make
-BuildRequires:  cmake(nlohmann_json)
-BuildRequires:  python3dist(breathe)
-BuildRequires:  python3dist(sphinx)
-BuildRequires:  python3dist(sphinx-rtd-theme)
+BuildRequires:  python3-breathe
+BuildRequires:  python3-sphinx
+BuildRequires:  python3-sphinx_rtd_theme

 %description
 Basic tools (containers, algorithms) used by other QuantStack packages.
@ -46,28 +48,43 @@ Documentation files for %{name} library.

 %build
 %cmake -DBUILD_TESTS=ON
-%cmake_build
+%make_build

 pushd docs
 make html SPHINXBUILD=sphinx-build-3
 rm build/html/.buildinfo
 popd

+
 %install
-%cmake_install
+%make_install
+

 %check
-%cmake_build --target xtest
+# https://github.com/QuantStack/xtl/issues/72
+%ifarch ppc64 s390x
+export GTEST_FILTER=-hash.verification
+%endif
+make xtest
+

 %files devel
 %doc README.md
 %license LICENSE
 %{_includedir}/xtl/
-%{_datadir}/cmake/xtl/
-%{_datadir}/pkgconfig/xtl.pc
+%{_libdir}/cmake/xtl/

 %files doc
 %doc docs/build/html

+
 %changelog
-%autochangelog
+* Wed May 02 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> 0.4.7-1
+- Update to latest version
+
+* Wed Mar 21 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> 0.4.4-2
+- Split documentation into subpackage
+- Run more tests on broken arches
+
+* Mon Mar 19 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> 0.4.4-1
+- Initial package for Fedora