6 changed files with 144 additions and 113 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,15 +4,3 @@
 /freecell-solver-5.8.0.tar.xz
 /freecell-solver-5.10.0.tar.xz
 /freecell-solver-5.12.0.tar.xz
-/freecell-solver-5.14.0.tar.xz
-/freecell-solver-5.16.0.tar.xz
-/freecell-solver-5.18.0.tar.xz
-/freecell-solver-5.20.0.tar.xz
-/freecell-solver-5.20.1.tar.xz
-/freecell-solver-5.22.1.tar.xz
-/freecell-solver-5.24.0.tar.xz
-/freecell-solver-6.0.1.tar.xz
-/freecell-solver-6.2.0.tar.xz
-/freecell-solver-6.4.0.tar.xz
-/freecell-solver-6.6.0.tar.xz
-/freecell-solver-6.8.0.tar.xz
--- a/fc-solve-fix-ldd-issue.patch
+++ b/fc-solve-fix-ldd-issue.patch
@ -1,39 +0,0 @@
-diff --git a/fc-solve/source/run-tests.pl b/fc-solve/source/run-tests.pl
-index e49988a0f..4575621a7 100644
--- a/fc-solve/source/run-tests.pl
-+++ b/fc-solve/source/run-tests.pl
-@@ -107,33 +107,7 @@ my %binaries;
-     } values %{ FC_Solve::Test::Valgrind::Data->get_hash };
- 
- use Digest ();
-if ( $FC_Solve::Paths::Base::IS_WIN || $force_rebuild )
-{
-    ++$rerun;
-}
-else
-{
-    foreach my $prog ( keys %progs )
-    {
-        say $prog;
-        die if !-e $prog;
-        foreach my $bin ( $prog, `ldd "$prog"` =~ m# => (\S+)#g )
-        {
-            say "bin $prog $bin";
-            $progs{$prog}{binaries}{$bin} //= (
-                $binaries{$bin} //= do
-                {
-                    Digest->new('SHA-256')->addfile($bin)->b64digest;
-                }
-            );
-        }
-        my $val = $cache->get( $progs{$prog} );
-        if ( !$val )
-        {
-            ++$rerun;
-        }
-    }
-}
-+++$rerun;
- $glob_was_set ||= $exclude_re_s;
- 
- sub myglob
--- a/freecell-solver-avoid-test-dependencies.patch
+++ b/freecell-solver-avoid-test-dependencies.patch
@ -0,0 +1,111 @@
+--- freecell-solver-5.6.0/t/CMakeLists.txt.orig	2019-04-18 22:49:30.701874513 +0300
+++ freecell-solver-5.6.0/t/CMakeLists.txt	2019-04-18 22:49:41.059812941 +0300
+@@ -45,48 +45,13 @@
+ 
+ IF (FCS_WITH_TEST_SUITE)
+ 
+-    SET (MODULE "Task::FreecellSolver::Testing")
+-    EXECUTE_PROCESS (
+-        COMMAND "${PERL_EXECUTABLE}" "-M${MODULE}=" "-e" "exit(0)"
+-        RESULT_VARIABLE "RESULT"
+-    )
+-    IF (NOT RESULT EQUAL 0)
+-        MESSAGE(FATAL_ERROR "You need the Perl 5/CPAN distribution ${MODULE} to run the test suite. Either skip the test suite using -DFCS_WITH_TEST_SUITE=OFF or see http://perl-begin.org/topics/cpan/ for installing from CPAN.")
+-    ENDIF ()
+-
+-    FIND_LIBRARY(LIBTAP_LIB tap)
+-    IF (NOT LIBTAP_LIB)
+-        MESSAGE (FATAL_ERROR
+-"You must install libtap ( http://www.shlomifish.org/open-source/projects/libtap/ ) and its development package or headers to run the test suite.
+-If you're not interested in building it, run cmake with the -DFCS_WITH_TEST_SUITE= flag."
+-    )
+-    ENDIF ()
+     MY_FIND_GMP ("to run the test suite." "FCS_WITH_TEST_SUITE")
+ 
+     INCLUDE_DIRECTORIES (BEFORE "${CMAKE_BINARY_DIR}")
+ 
+-    MY_ADD_EXE (
+-        "card-test-render.t.exe"
+-        "card-test-render.c"
+-    )
+-
+-    MY_ADD_EXE (
+-        "card-test-parse.t.exe"
+-        "card-test-parse.c"
+-    )
+-
+     FILE (MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/t")
+     FILE (MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/verify-cache")
+ 
+-    SET (EXE_FILE "bit-reader-and-writer-test.t.exe")
+-
+-    ADD_EXECUTABLE(
+-        "${EXE_FILE}"
+-        "${CMAKE_CURRENT_SOURCE_DIR}/bit-reader-and-writer-test.c"
+-    )
+-
+-    TARGET_LINK_LIBRARIES (${EXE_FILE} ${LIBTAP_LIB})
+-
+     SET_SOURCE_FILES_PROPERTIES (
+         "bit-reader-and-writer-test.c"
+         PROPERTIES
+@@ -95,59 +60,10 @@
+ 
+     IF ("${DEBONDT_DELTA_STATES}")
+ 
+-        SET (EXE_FILE "delta-states-debondt-test.t.exe")
+-
+-        ADD_EXECUTABLE(
+-            "${EXE_FILE}"
+-            "${CMAKE_CURRENT_SOURCE_DIR}/debondt-delta-states-test.c"
+-        )
+-
+-        TARGET_LINK_LIBRARIES (${EXE_FILE} ${LIBTAP_LIB} ${LIBGMP_LIB})
+-
+-        SET_SOURCE_FILES_PROPERTIES (
+-            "delta-states-test.c"
+-            PROPERTIES
+-                OBJECT_DEPENDS
+-                    "${CMAKE_CURRENT_SOURCE_DIR}/../delta_states_debondt.c"
+-                GENERATED "1"
+-        )
+-
+     ELSE ()
+ 
+-        SET (EXE_FILE "delta-states-test.t.exe")
+-
+-        ADD_EXECUTABLE(
+-            "${EXE_FILE}"
+-            "${CMAKE_CURRENT_SOURCE_DIR}/delta-states-test.c"
+-            "${CMAKE_CURRENT_SOURCE_DIR}/../delta_states.c"
+-        )
+-
+-        TARGET_LINK_LIBRARIES (${EXE_FILE} ${LIBTAP_LIB} ${LIBGMP_LIB})
+-
+-        SET_SOURCE_FILES_PROPERTIES (
+-            "delta-states-test.c"
+-            PROPERTIES
+-                OBJECT_DEPENDS
+-                    "${CMAKE_CURRENT_SOURCE_DIR}/../delta_states.c"
+-                GENERATED "1"
+-        )
+     ENDIF ()
+ 
+-    SET (EXE_FILE "dbm-kaztree-compare-records-test.t.exe")
+-
+-    ADD_EXECUTABLE(
+-        "${EXE_FILE}"
+-        "dbm-kaztree-compare-records-test.c"
+-    )
+-
+-    # This is a kind-of-temporary kludge to make
+-    # "dbm-kaztree-compare-records-test.c" build.
+-    ADD_DEFINITIONS("-DFCS_DBM_USE_LIBAVL=1"
+-        "-I${CMAKE_CURRENT_SOURCE_DIR}/.."
+-        "-I${CMAKE_CURRENT_SOURCE_DIR}/../fcs-libavl/"
+-        )
+-    TARGET_LINK_LIBRARIES (${EXE_FILE} ${LIBTAP_LIB})
+-
+     GEN_INDIVIDUAL_TESTS(
+         "generate_valgrind_tests"
+         "${PROJECT_SOURCE_DIR}/scripts/gen-individual-valgrind-test-scripts.pl"
--- a/freecell-solver-no-rpath.diff
+++ b/freecell-solver-no-rpath.diff
@ -0,0 +1,25 @@
+--- freecell-solver-5.0.0/CMakeLists.txt.Orig	2018-11-04 12:35:13.489403737 +0200
+++ freecell-solver-5.0.0/CMakeLists.txt	2018-11-04 12:35:41.265314514 +0200
+@@ -84,18 +84,18 @@
+ ### (Taken from that wiki page)
+ 
+ # use, i.e. don't skip the full RPATH for the build tree
+-SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+# SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+ 
+ # when building, don't use the install RPATH already
+ # (but later on when installing)
+-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+# SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ 
+ # the RPATH to be used when installing
+-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+# SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+ 
+ # add the automatically determined parts of the RPATH
+ # which point to directories outside the build tree to the install RPATH
+-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+# SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 
+ SET (STATES_TYPE "INDIRECT_STACK_STATES" CACHE STRING
+     "States Type ('INDIRECT_STACK_STATES', or 'COMPACT_STATES'). No need to usually change.")
--- a/freecell-solver.spec
+++ b/freecell-solver.spec
@ -3,8 +3,8 @@
 %global develname lib%{name}-devel

 Name: freecell-solver
-Version: 6.8.0
-Release: 4%{?dist}
+Version: 5.12.0
+Release: 1%{?dist}
 License: MIT
 Source0: https://fc-solve.shlomifish.org/downloads/fc-solve/%{name}-%{version}.tar.xz
 URL: https://fc-solve.shlomifish.org/
@ -56,8 +56,6 @@ BuildRequires: perl(warnings)
 BuildRequires: perl(YAML::XS)
 BuildRequires: perl-devel
 BuildRequires: pkgconfig(cmocka)
-BuildRequires: pkgconfig(librinutils) >= 0.2.0
-BuildRequires: python3-devel
 BuildRequires: python3-cffi
 BuildRequires: python3-freecell_solver
 BuildRequires: python3-pysol-cards
@ -79,8 +77,6 @@ This package also contains command line executables to generate the initial
 boards of several popular Freecell implementations.

 %files
-%{_bindir}/dbm-fc-solver
-%{_bindir}/depth-dbm-fc-solver
 %{_bindir}/fc-solve
 %{_bindir}/find-freecell-deal-index.py
 %{_bindir}/freecell-solver-fc-pro-range-solve
@ -139,6 +135,7 @@ You should install it if you are a game developer who would like to use
 Freecell Solver from within your programs.

 %files -n %{develname}
+%{_includedir}/freecell-solver/
 %{_includedir}/freecell-solver/*.h
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libfreecell-solver.so
@ -151,16 +148,14 @@ Freecell Solver from within your programs.
 %build
 # The game limit flags are recommended by the PySolFC README.
 %cmake -DLOCALE_INSTALL_DIR=%{_datadir}/locale -DLIB_INSTALL_DIR=%{_libdir} -DMAX_NUM_FREECELLS=8 -DMAX_NUM_STACKS=20 -DMAX_NUM_INITIAL_CARDS_IN_A_STACK=60 -DDISABLE_APPLYING_RPATH=TRUE
-%cmake_build
+%make_build

 %check
-%__rm -f t/t/py-flake8.t t/t/tidyall.t
-src="`pwd`"
-cd "%{__cmake_builddir}"
-perl "$src"/run-tests.pl
+%__rm -f t/t/tidyall.t
+perl ./run-tests.pl

 %install
-%cmake_install
+%make_install
 bn="fc_solve_find_index_s2ints.py"
 dest="%{buildroot}/%{python3_sitelib}"
 src="%{buildroot}/%{_bindir}/$bn"
@ -173,55 +168,6 @@ chmod a-x "$dest/$bn"
 find %{buildroot} -name *.a -delete

 %changelog
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jul 05 2023 Python Maint <python-maint@redhat.com> - 6.8.0-3
- Rebuilt for Python 3.12
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Oct 20 2022 Shlomi Fish <shlomif@shlomifish.org> 6.8.0-1
- New version
-
-* Wed Aug 03 2022 Shlomi Fish <shlomif@shlomifish.org> 6.6.0-3
- Add fc-solve-fix-ldd-issue.patch to fix run-tests.pl ldd-output processing
- Add BuildRequires on python3-devel.
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Oct 09 2021 Shlomi Fish <shlomif@shlomifish.org> 6.6.0-1
- New version
-
-* Tue Sep 28 2021 Shlomi Fish <shlomif@shlomifish.org> 6.4.0-1
- New version
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Oct 15 2020 Shlomi Fish <shlomif@shlomifish.org> 6.2.0-1
- New version
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Jul 26 2020 Shlomi Fish <shlomif@shlomifish.org> 6.0.1-1
- New version; convert to cmake macros.
-
-* Tue Apr 14 2020 Shlomi Fish <shlomif@shlomifish.org> - 5.22.1-1
- New version
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.16.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.10.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (freecell-solver-6.8.0.tar.xz) = 3baed3cc02405036b882b8eb71f0e54d11051789b9071081a26a6feca653e13129b7d2e5f3ffcbbbac528e67eccdb95d0adcbf598b35f0849a220c90bed131ee
+SHA512 (freecell-solver-5.12.0.tar.xz) = ee7dbc7b3275add2b3adb7c5f07e5e500645bf2fe1d11cd71c369d6ac9afd9d1846dd68729de0f643f034c014feec2576d94c92c1f08b937e3bec04cd4bbc290