From 179b0b3d59f1bdcb01999d009965b8e1729ee2de Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Tue, 14 Apr 2020 12:34:40 +0300 Subject: [PATCH] new version 5.22.1 --- .gitignore | 1 + freecell-solver-avoid-test-dependencies.patch | 111 ------------------ freecell-solver-no-rpath.diff | 25 ---- freecell-solver.spec | 5 +- sources | 2 +- 5 files changed, 6 insertions(+), 138 deletions(-) delete mode 100644 freecell-solver-avoid-test-dependencies.patch delete mode 100644 freecell-solver-no-rpath.diff diff --git a/.gitignore b/.gitignore index f19954e..eb46b6a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /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 diff --git a/freecell-solver-avoid-test-dependencies.patch b/freecell-solver-avoid-test-dependencies.patch deleted file mode 100644 index e652232..0000000 --- a/freecell-solver-avoid-test-dependencies.patch +++ /dev/null @@ -1,111 +0,0 @@ ---- 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" diff --git a/freecell-solver-no-rpath.diff b/freecell-solver-no-rpath.diff deleted file mode 100644 index 09ff8f4..0000000 --- a/freecell-solver-no-rpath.diff +++ /dev/null @@ -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.") diff --git a/freecell-solver.spec b/freecell-solver.spec index 0b94c0a..93d7d38 100644 --- a/freecell-solver.spec +++ b/freecell-solver.spec @@ -3,7 +3,7 @@ %global develname lib%{name}-devel Name: freecell-solver -Version: 5.20.1 +Version: 5.22.1 Release: 1%{?dist} License: MIT Source0: https://fc-solve.shlomifish.org/downloads/fc-solve/%{name}-%{version}.tar.xz @@ -170,6 +170,9 @@ chmod a-x "$dest/$bn" find %{buildroot} -name *.a -delete %changelog +* Tue Apr 14 2020 Shlomi Fish - 5.22.1-1 +- New version + * Tue Jan 28 2020 Fedora Release Engineering - 5.16.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index d56d439..ee5bdfc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (freecell-solver-5.20.1.tar.xz) = 439c55713f5fdb98fa90b203fb5a0d135e7f3aa249ee59e659ed371f7d4de03cc16945b3170f3c1fc4e2afe3733866a6db80945868e129589a4fdde00df51335 +SHA512 (freecell-solver-5.22.1.tar.xz) = 8472ce519168481fcbfa0347d1d86859c7344fe34a58bbef694d22653c02f09e70722bf92e052bda5b3f9bce8cee0f745ac45c9e08712b15c34bb40306f510f6