[rpms/cryptominisat] rawhide: Version 5.14.5

[rpms/cryptominisat] rawhide: Version 5.14.5

[Jerry James]

            A new commit has been pushed.

            Repo   : rpms/cryptominisat
            Branch : rawhide
            Commit : 38d1e16dec9526822e45017567412e6614267890
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-06-01T12:06:12-06:00
            Stats  : +58/-27 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/cryptominisat/c/38d1e16dec9526822e45017567412e6614267890?branch=rawhide

            Log:
            Version 5.14.5

- Use the cmake declarative buildsystem

---
diff --git a/cryptominisat-cmake.patch b/cryptominisat-cmake.patch
index 8433fb4..47a1307 100644
--- a/cryptominisat-cmake.patch
+++ b/cryptominisat-cmake.patch
@@ -1,6 +1,30 @@
---- cryptominisat-release-v5.14.4/CMakeLists.txt.orig	2026-04-04 13:00:54.000000000 -0600
-+++ cryptominisat-release-v5.14.4/CMakeLists.txt	2026-04-20 09:30:02.264747676 -0600
-@@ -164,8 +164,6 @@ if(ENABLE_ASSERTIONS)
+--- cryptominisat-release-v5.14.5/cadiback/CMakeLists.txt.orig	2026-05-24 02:45:05.000000000 -0600
++++ cryptominisat-release-v5.14.5/cadiback/CMakeLists.txt	2026-06-01 11:32:16.163467777 -0600
+@@ -16,9 +16,6 @@ if(NOT WIN32)
+         add_cxx_flag_if_supported("-fvisibility=hidden")
+     endif()
+ 
+-    add_cxx_flag_if_supported("-mpopcnt")
+-    add_cxx_flag_if_supported("-msse4.2")
+-    add_cxx_flag_if_supported("-mpclmul")
+     if(CMAKE_BUILD_TYPE STREQUAL "Release")
+         # add_cxx_flag_if_supported("-flto")
+         # add_link_flag_if_supported("-flto")
+@@ -27,11 +24,8 @@ if(NOT WIN32)
+         add_cxx_flag_if_supported("-Wextra")
+         add_cxx_flag_if_supported("-Wunused")
+         add_cxx_flag_if_supported("-Wsign-compare")
+-        add_cxx_flag_if_supported("-fno-omit-frame-pointer")
+-        add_cxx_flag_if_supported("-ggdb3")
+         add_cxx_flag_if_supported("-Wtype-limits")
+         add_cxx_flag_if_supported("-Wuninitialized")
+-        add_cxx_flag_if_supported("-Wno-deprecated")
+         add_cxx_flag_if_supported("-Wno-extra-semi")
+         add_cxx_flag_if_supported("-Wstrict-aliasing")
+         add_cxx_flag_if_supported("-Wpointer-arith")
+--- cryptominisat-release-v5.14.5/CMakeLists.txt.orig	2026-05-24 04:06:28.000000000 -0600
++++ cryptominisat-release-v5.14.5/CMakeLists.txt	2026-06-01 11:30:42.126185714 -0600
+@@ -189,8 +189,6 @@ if(ENABLE_ASSERTIONS)
  else()
      # Note this definition doesn't appear in the cache variables.
      add_compile_definitions(NDEBUG)
@@ -9,7 +33,7 @@
  endif()
  
  # Note: O3 gives slight speed increase, 1 more solved from SAT Comp'14 @ 3600s
-@@ -259,9 +257,6 @@ if(NOT WIN32)
+@@ -284,9 +282,6 @@ if(NOT WIN32)
          add_cxx_flag_if_supported("-fvisibility=hidden")
      endif()
  
@@ -19,7 +43,7 @@
      if(CMAKE_BUILD_TYPE STREQUAL "Release")
        # add_cxx_flag_if_supported("-flto")
        # add_c_flag_if_supported("-flto")
-@@ -271,7 +266,6 @@ if(NOT WIN32)
+@@ -296,7 +291,6 @@ if(NOT WIN32)
          add_cxx_flag_if_supported("-Wextra")
          add_cxx_flag_if_supported("-Wunused")
          add_cxx_flag_if_supported("-Wsign-compare")
@@ -27,7 +51,7 @@
          add_cxx_flag_if_supported("-Wtype-limits")
          add_cxx_flag_if_supported("-Wuninitialized")
          add_cxx_flag_if_supported("-Wno-deprecated")
-@@ -283,10 +277,8 @@ if(NOT WIN32)
+@@ -308,10 +302,8 @@ if(NOT WIN32)
          add_cxx_flag_if_supported("-Wparentheses")
          add_cxx_flag_if_supported("-Wunreachable-code")
          add_cxx_flag_if_supported("-g")
@@ -38,7 +62,7 @@
  
          # Apparently needed before OS X Mavericks (2013)
          #add_c_flag_if_supported("-stdlib=libc++")
-@@ -299,10 +291,6 @@ if(LIMITMEM)
+@@ -324,10 +316,6 @@ if(LIMITMEM)
      add_compile_definitions(LIMITMEM)
  endif()
  

diff --git a/cryptominisat.spec b/cryptominisat.spec
index 190a575..aecdab4 100644
--- a/cryptominisat.spec
+++ b/cryptominisat.spec
@@ -1,11 +1,11 @@
 # We bundle cadiback because it has been modified by the cryptominisat team to
 # present a library interface to cryptominisat
 %global cadiurl     https://github.com/meelgroup/cadiback
-%global cadicommit  3f87cdbe4565fba7e0dabb4c0638b00bbf05d9cc
+%global cadicommit  35f027383abf3b4b52bbc8af789c8f1aa3d84ad2
 %global giturl      https://github.com/msoos/cryptominisat
 
 Name:           cryptominisat
-Version:        5.14.4
+Version:        5.14.5
 Release:        %autorelease
 Summary:        SAT solver
 
@@ -25,6 +25,13 @@ Patch:          %{name}-breakid.patch
 
 # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
+BuildSystem:    cmake
+BuildOption(conf): -Dcadical_DIR:PATH=%{_prefix}
+BuildOption(conf): -DBUILD_PYTHON_EXTENSION:BOOL=ON
+BuildOption(conf): -DCMAKE_INSTALL_BINDIR=bin
+BuildOption(conf): -DCMAKE_INSTALL_LIBDIR=%{_lib}
+BuildOption(conf): -DENABLE_ASSERTIONS:BOOL=OFF
+BuildOption(conf): -DNOBREAKID:BOOL=OFF
 
 BuildRequires:  boost-devel
 BuildRequires:  cmake
@@ -75,16 +82,19 @@ Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Python 3 interface to %{name}.
 
 %prep
-%autosetup -n %{name}-release-v%{version} -p1 -a1
-
-# Permit use of cmake 4
-sed -i 's/,<4//' pyproject.toml
+%autosetup -N -n %{name}-release-v%{version} -a1
 
 # Make cadiback visible to cmake
 mkdir -p %{_vpath_builddir}
 mv cadiback-%{cadicommit} cadiback
 sed -i '/CADIBACK_GITID/s/unknown/%{cadicommit}/' cadiback/CMakeLists.txt
 
+# Apply patches after the cadiback rename
+%autopatch -p1
+
+# Permit use of cmake 4
+%pyproject_patch_dependency cmake:drop_upper
+
 # Do not try to checkout cadiback with git
 sed -e '/GIT_REPOSITORY.*cadiback/i\            SOURCE_DIR     ../cadiback)' \
     -e '/GIT_REPOSITORY.*cadiback/,/GIT_SHALLOW/d' \
@@ -105,21 +115,11 @@ rm -fr src/mpicosat
 %generate_buildrequires
 %pyproject_buildrequires
 
-%build
+%conf -p
 export CFLAGS='%{build_cflags} -DNTRACING'
 export CXXFLAGS='%{build_cxxflags} -DNTRACING'
-%cmake \
-    -Dcadical_DIR:PATH=%{_prefix} \
-    -DBUILD_PYTHON_EXTENSION:BOOL=ON \
-    -DCMAKE_INSTALL_BINDIR=bin \
-    -DCMAKE_INSTALL_LIBDIR=%{_lib} \
-    -DENABLE_ASSERTIONS:BOOL=OFF \
-    -DNOBREAKID:BOOL=OFF
-%cmake_build
-
-%install
-%cmake_install
 
+%install -a
 # We don't want the bundled cadiback
 rm -fr %{buildroot}%{_includedir}/cadiback
 rm -fr %{buildroot}%{_libdir}/cmake/cadiback
@@ -167,20 +167,27 @@ cat > %{metadata}/top_level.txt << EOF
 pycryptosat
 EOF
 
+# Avoid a name clash
+mv %{buildroot}%{_bindir}/oracle %{buildroot}%{_bindir}/cryptominisat5-oracle
+
 %files
 %doc README.md
 %{_bindir}/cryptominisat5
+%{_bindir}/cryptominisat5-oracle
 %{_mandir}/man1/cryptominisat5.1*
 
 %files devel
 %{_includedir}/cryptominisat5/
+%{_includedir}/oracle/
 %{_libdir}/libcryptominisat5.so
+%{_libdir}/liboracle.so
 %{_libdir}/cmake/cryptominisat5/
 
 %files libs
 %doc AUTHORS
 %license LICENSE.txt
 %{_libdir}/libcryptominisat5.so.5.14
+%{_libdir}/liboracle.so.5.14
 
 %files -n python3-pycryptosat
 %doc python/README.md

diff --git a/sources b/sources
index c8c0caf..3b70305 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (cryptominisat-5.14.4.tar.gz) = fba989c2fccfdca6cd74fc8a4c5970ceb545bf0515ac5133cb9417a243e62fbcffe8b0a1cac628c51ae9c12cab93be20dd780d4490c9b395fc9cb037721626b6
-SHA512 (cadiback-3f87cdb.tar.gz) = b21a2a2b3e1e56f1efb3777d7c4e96472f0dd98d5e840f60ba74c51409828d7388d74383bc6ab7a590c9b418d9582720534107708ad223bf6316b01057e59a47
+SHA512 (cryptominisat-5.14.5.tar.gz) = a4a9c100b4a8e75b0739913a009b93ea1fea017c9ab25772290fe6ffd594c716320327e8024510062f8ee5d83706a1ea0e328271edba0bffff2b979145c796ff
+SHA512 (cadiback-35f0273.tar.gz) = 9539b9cd1e6c8a99c75eba21c9d8f83a6dde891944e62d694647cff0577bb13007086f53fcae67c3445fb555637ef57c1aff246ab4ccce21d769e5c3380d2736