diff --git a/black-hole-solver-1.10.1.tar.xz b/black-hole-solver-1.10.1.tar.xz new file mode 100644 index 0000000..1fee0f9 --- /dev/null +++ b/black-hole-solver-1.10.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36e1953a99e02e82489a3cb109fb590bcab307b4ddaec34cb0e67347668511e2 +size 78848 diff --git a/black-hole-solver-1.8.0.tar.xz b/black-hole-solver-1.8.0.tar.xz deleted file mode 100644 index 57669cb..0000000 --- a/black-hole-solver-1.8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f73c14272545baa4cba717b61646ec0c610b124e1721288b0a9bff680bb9982c -size 76264 diff --git a/black-hole-solver.changes b/black-hole-solver.changes index 8cc925d..3e327e3 100644 --- a/black-hole-solver.changes +++ b/black-hole-solver.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Apr 29 11:35:17 UTC 2021 - Ferdinand Thiessen + +- Update to version 1.10.1: + * Add "--show-max-num-played-cards" flag, inspired by + https://politaire.com/article/blackhole.html +- Add fix-pkgconfig-libdir.patch to fix path of library dir in + pkgconfig file. + ------------------------------------------------------------------- Mon Jul 27 17:46:00 UTC 2020 - Fabian Vogt diff --git a/black-hole-solver.spec b/black-hole-solver.spec index 6d4774b..de89111 100644 --- a/black-hole-solver.spec +++ b/black-hole-solver.spec @@ -1,7 +1,7 @@ # # spec file for package black-hole-solver # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,15 @@ # Missing perl(Env::Path), should also skip some tests like build-process %global run_tests 0 Name: black-hole-solver -Version: 1.8.0 +Version: 1.10.1 Release: 0 Summary: The Black Hole Solver Executable License: MIT -Group: Amusements/Games +Group: Amusements/Games/Board/Card URL: https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/ -Source: https://fc-solve.shlomifish.org/downloads/fc-solve/black-hole-solver-%{version}.tar.xz +Source: https://sourceforge.net/projects/fc-solve/files/fc-solve/%{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE fix-pkgconfig-libdir.patch -- https://sourceforge.net/p/fc-solve/tickets/1/ +Patch0: fix-pkgconfig-libdir.patch BuildRequires: cmake BuildRequires: cmake(Rinutils) BuildRequires: gcc-c++ @@ -34,8 +36,9 @@ BuildRequires: perl(Path::Tiny) BuildRequires: xxhash-devel %if %{run_tests} # For testing -BuildRequires: perl(Env::Path) BuildRequires: perl(Getopt::Long) +BuildRequires: perl(Env::Path) +BuildRequires: perl(Test::Some) BuildRequires: perl(Test::More) %endif @@ -46,11 +49,11 @@ a command line application that after being fed with a layout will emit the cards to move. %package -n libblack_hole_solver%{sover} -Summary: The Black Hole Solitaire Solver dynamic libraries +Summary: Solitaire Solver dynamic libraries Group: System/Libraries %description -n libblack_hole_solver%{sover} -Contains the Black Hole Solitaire library. +Contains the Black Hole Solitaire dynamic library. %package devel Summary: Black Hole Solver development headers @@ -61,10 +64,13 @@ Requires: libblack_hole_solver%{sover} = %{version} Files needed for building applications against Black Hole Solver. %prep -%autosetup -p3 +%autosetup -p1 %build -%cmake -DFCS_AVOID_TCMALLOC=ON -DUSE_SYSTEM_XXHASH=ON -DBUILD_STATIC_LIBRARY=OFF +%cmake -DFCS_AVOID_TCMALLOC=ON \ + -DUSE_SYSTEM_XXHASH=ON \ + -DBUILD_STATIC_LIBRARY=OFF \ + -DENABLE_DISPLAYING_MAX_NUM_PLAYED_CARDS=ON %cmake_build %if %{run_tests} @@ -76,8 +82,6 @@ export FCS_TEST_WITHOUT_VALGRIND=1 %install %cmake_install -# Fix the .pc file manually for now -sed -i'' 's#/lib$#/%{_lib}#g' %{buildroot}/%{_libdir}/pkgconfig/*.pc %post -p /sbin/ldconfig -n libblack_hole_solver1 %postun -p /sbin/ldconfig -n libblack_hole_solver1 diff --git a/fix-pkgconfig-libdir.patch b/fix-pkgconfig-libdir.patch new file mode 100644 index 0000000..b978673 --- /dev/null +++ b/fix-pkgconfig-libdir.patch @@ -0,0 +1,11 @@ +diff -Nur black-hole-solver-1.10.1/libblack-hole-solver.pc.in black-new/libblack-hole-solver.pc.in +--- black-hole-solver-1.10.1/libblack-hole-solver.pc.in 2019-12-27 16:06:01.000000000 +0100 ++++ black-new/libblack-hole-solver.pc.in 2021-04-29 13:52:47.298340002 +0200 +@@ -1,6 +1,6 @@ + prefix="@CMAKE_INSTALL_PREFIX@" + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include + + Name: Black Hole Solitaire Solver