Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1 +1,18 @@
 /freecell-solver-5.0.0.tar.xz
+/freecell-solver-5.4.0.tar.xz
+/freecell-solver-5.6.0.tar.xz
+/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

fc-solve-fix-ldd-issue.patch

@@ -0,0 +1,39 @@
+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

freecell-solver-no-rpath.diff

@@ -1,25 +0,0 @@
---- 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.")

freecell-solver.spec

@@ -3,12 +3,11 @@
 %global develname lib%{name}-devel
 
 Name: freecell-solver
-Version: 5.0.0
+Version: 6.8.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: MIT
-Source0: http://fc-solve.shlomifish.org/downloads/fc-solve/%{name}-%{version}.tar.xz
+Source0: https://fc-solve.shlomifish.org/downloads/fc-solve/%{name}-%{version}.tar.xz
-Patch1: freecell-solver-no-rpath.diff
+URL: https://fc-solve.shlomifish.org/
-URL: http://fc-solve.shlomifish.org/
 Summary: The Freecell Solver Executable
 
 BuildRequires: cmake
@@ -18,25 +17,58 @@ BuildRequires: gmp-devel
 BuildRequires: gperf
 BuildRequires: make
 BuildRequires: perl(autodie)
-BuildRequires: perl(lib)
 BuildRequires: perl(Carp)
+BuildRequires: perl(CHI)
 BuildRequires: perl(Cwd)
 BuildRequires: perl(Data::Dumper)
 BuildRequires: perl(Digest::SHA)
+BuildRequires: perl(Env::Path)
 BuildRequires: perl(File::Path)
+BuildRequires: perl(lib)
 BuildRequires: perl(File::Spec)
+BuildRequires: perl(File::Which)
+BuildRequires: perl(Games::Solitaire::Verify)
+BuildRequires: perl(Games::Solitaire::Verify::Solution)
+BuildRequires: perl(Inline)
+BuildRequires: perl(Inline::C)
+BuildRequires: perl(IPC::Open2)
 BuildRequires: perl(lib)
 BuildRequires: perl(List::MoreUtils)
+BuildRequires: perl(Moo)
+BuildRequires: perl(MooX)
+BuildRequires: perl(MooX::late)
 BuildRequires: perl(parent)
 BuildRequires: perl(Path::Tiny)
+BuildRequires: perl(Storable)
 BuildRequires: perl(strict)
+BuildRequires: perl(String::ShellQuote)
+# BuildRequires: perl(Task::FreecellSolver::Testing)
 BuildRequires: perl(Template)
+BuildRequires: perl(Test::Data::Split)
+BuildRequires: perl(Test::Data::Split::Backend::Hash)
+BuildRequires: perl(Test::Data::Split::Backend::ValidateHash)
+BuildRequires: perl(Test::Differences)
+BuildRequires: perl(Test::More)
+BuildRequires: perl(Test::RunValgrind)
+BuildRequires: perl(Test::TrailingSpace)
+BuildRequires: perl(Test::Trap)
 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
 BuildRequires: python3-random2
 BuildRequires: python3-rpm-macros
 BuildRequires: python3dist(six)
+BuildRequires: python3dist(pycotap)
 Requires: %{libname}%{?_isa} = %{version}-%{release}
+# BuildRequires: tap-devel
+BuildRequires: the_silver_searcher
+BuildRequires: valgrind
 
 %description
 The Freecell Solver package contains the fc-solve executable which is
@@ -47,6 +79,8 @@ 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
@@ -105,7 +139,6 @@ 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
@@ -114,15 +147,20 @@ Freecell Solver from within your programs.
 
 %prep
 %setup -q
-%patch1 -p1 -b .rem-rpath
 
 %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 -DFCS_WITH_TEST_SUITE=OFF
+%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
-%make_build
+%cmake_build
+
+%check
+%__rm -f t/t/py-flake8.t t/t/tidyall.t
+src="`pwd`"
+cd "%{__cmake_builddir}"
+perl "$src"/run-tests.pl
 
 %install
-%make_install
+%cmake_install
 bn="fc_solve_find_index_s2ints.py"
 dest="%{buildroot}/%{python3_sitelib}"
 src="%{buildroot}/%{_bindir}/$bn"
@@ -135,6 +173,58 @@ 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
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (freecell-solver-5.0.0.tar.xz) = 3d3cf999f82d9257c1ddaea8fcedee95cfcc46a9dd0e47d6f14e40fed171ad643cc48396ada9b3787942f81d212b0bafcf0c80a6059e884e27a70295fdcab54a
+SHA512 (freecell-solver-6.8.0.tar.xz) = 3baed3cc02405036b882b8eb71f0e54d11051789b9071081a26a6feca653e13129b7d2e5f3ffcbbbac528e67eccdb95d0adcbf598b35f0849a220c90bed131ee