Compare commits
No commits in common. "rawhide" and "f30" have entirely different histories.
@ -1,6 +1,6 @@
|
||||
--- CMakeLists.txt.orig 2020-07-06 15:45:41.000000000 -0600
|
||||
+++ CMakeLists.txt 2020-11-22 11:43:02.146650954 -0700
|
||||
@@ -210,8 +210,6 @@ if (ENABLE_ASSERTIONS)
|
||||
--- CMakeLists.txt.orig 2018-12-18 14:48:48.000000000 -0700
|
||||
+++ CMakeLists.txt 2018-12-24 14:34:21.698019713 -0700
|
||||
@@ -193,8 +193,6 @@ if (ENABLE_ASSERTIONS)
|
||||
else()
|
||||
# Note this definition doesn't appear in the cache variables.
|
||||
add_definitions(-DNDEBUG)
|
||||
@ -9,7 +9,12 @@
|
||||
endif()
|
||||
|
||||
# Note: O3 gives slight speed increase, 1 more solved from SAT Comp'14 @ 3600s
|
||||
@@ -330,9 +328,6 @@ if (NOT WIN32)
|
||||
@@ -300,14 +298,10 @@ if (NOT WIN32)
|
||||
if(CMAKE_BUILD_TYPE STREQUAL "Release")
|
||||
#add_cxx_flag_if_supported("-flto")
|
||||
else()
|
||||
- add_cxx_flag_if_supported("-mtune=native")
|
||||
add_cxx_flag_if_supported("-Wall")
|
||||
add_cxx_flag_if_supported("-Wextra")
|
||||
add_cxx_flag_if_supported("-Wunused")
|
||||
add_cxx_flag_if_supported("-Wsign-compare")
|
||||
@ -19,15 +24,15 @@
|
||||
add_cxx_flag_if_supported("-Wtype-limits")
|
||||
add_cxx_flag_if_supported("-Wuninitialized")
|
||||
add_cxx_flag_if_supported("-Wno-deprecated")
|
||||
@@ -350,7 +345,6 @@ if (NOT WIN32)
|
||||
add_cxx_flag_if_supported("-msse4.2")
|
||||
add_cxx_flag_if_supported("-Wextra-semi-stmt")
|
||||
add_cxx_flag_if_supported("-Wweak-vtables")
|
||||
@@ -319,7 +313,6 @@ if (NOT WIN32)
|
||||
add_cxx_flag_if_supported("-Winit-self")
|
||||
add_cxx_flag_if_supported("-Wparentheses")
|
||||
add_cxx_flag_if_supported("-Wunreachable-code")
|
||||
- add_cxx_flag_if_supported("-ggdb3")
|
||||
|
||||
# Apparently needed before OS X Maverics (2013)
|
||||
#add_c_flag_if_supported("-stdlib=libc++")
|
||||
@@ -373,10 +367,6 @@ endif()
|
||||
@@ -342,10 +335,6 @@ endif()
|
||||
# -----------------------------------------------------------------------------
|
||||
# Uncomment these for static compilation under Linux (messes up Valgrind)
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- src/ccnr.h.orig 2020-07-06 15:45:41.000000000 -0600
|
||||
+++ src/ccnr.h 2023-01-17 19:24:13.235505927 -0700
|
||||
@@ -25,6 +25,7 @@ THE SOFTWARE.
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
+#include <cstdint>
|
||||
#include "ccnr_mersenne.h"
|
||||
|
||||
using std::vector;
|
||||
@ -1,27 +0,0 @@
|
||||
--- python/setup.py.in.orig 2020-07-06 15:45:41.000000000 -0600
|
||||
+++ python/setup.py.in 2022-12-19 09:44:31.964206198 -0700
|
||||
@@ -26,9 +26,8 @@
|
||||
import sys
|
||||
import os
|
||||
import platform
|
||||
-from distutils.core import setup, Extension
|
||||
-from distutils import sysconfig
|
||||
-from distutils.cmd import Command
|
||||
+from setuptools import setup, Extension, Command
|
||||
+import sysconfig
|
||||
|
||||
__PACKAGE_VERSION__ = "0.2.0"
|
||||
__LIBRARY_VERSION__ = "${CMS_FULL_VERSION}"
|
||||
@@ -59,10 +58,9 @@ def _init_posix(init):
|
||||
Forces g++ instead of gcc on most systems
|
||||
credits to eric jones (eric@enthought.com) (found at Google Groups)
|
||||
"""
|
||||
- def wrapper():
|
||||
- init()
|
||||
+ def wrapper(config_vars):
|
||||
+ init(config_vars)
|
||||
|
||||
- config_vars = sysconfig.get_config_vars() # by reference
|
||||
if config_vars["MACHDEP"].startswith("sun"):
|
||||
# Sun needs forced gcc/g++ compilation
|
||||
config_vars['CC'] = 'gcc'
|
||||
@ -1,40 +1,30 @@
|
||||
# Cryptominisat is more efficient when it can use BreakID.
|
||||
# BreakID bundles saucy.
|
||||
# Saucy has a "noncommercial use only" clause in the license, so it is non-free.
|
||||
# Therefore, we have to do without BreakID.
|
||||
|
||||
Name: cryptominisat
|
||||
Version: 5.8.0
|
||||
Release: 15%{?dist}
|
||||
Version: 5.6.8
|
||||
Release: 1%{?dist}
|
||||
Summary: SAT solver
|
||||
|
||||
# The project as a whole is MIT.
|
||||
# src/MersenneTwister.h is BSD-3-Clause.
|
||||
License: MIT AND BSD-3-Clause
|
||||
URL: https://www.msoos.org/
|
||||
License: MIT
|
||||
URL: http://www.msoos.org/
|
||||
Source0: https://github.com/msoos/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
# Change the CMake files to not change Fedora build flags
|
||||
Patch0: %{name}-cmake.patch
|
||||
# Use setuptools instead of distutils (bz 2154857)
|
||||
Patch1: %{name}-setuptools.patch
|
||||
# Add a missing #include statement
|
||||
Patch2: %{name}-include.patch
|
||||
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gperftools-devel
|
||||
BuildRequires: help2man
|
||||
BuildRequires: make
|
||||
BuildRequires: pkgconfig(m4ri)
|
||||
BuildRequires: pkgconfig(sqlite3)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
BuildRequires: m4ri-devel
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: %{py3_dist setuptools}
|
||||
BuildRequires: tbb-devel
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
# This can be removed once Fedora 28 reaches EOL
|
||||
Obsoletes: cryptominisat4 < 4.5.4-1
|
||||
Provides: cryptominisat4 = %{version}-%{release}
|
||||
|
||||
%description
|
||||
CryptoMiniSat is a modern, multi-threaded, feature-rich, simplifying SAT
|
||||
solver. Highlights:
|
||||
@ -48,6 +38,12 @@ solver. Highlights:
|
||||
Summary: Header files for developing with %{name}
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
Requires: m4ri-devel%{?_isa}
|
||||
Requires: tbb-devel%{?_isa}
|
||||
Requires: cmake-filesystem
|
||||
|
||||
# This can be removed once Fedora 28 reaches EOL
|
||||
Obsoletes: cryptominisat4-devel < 4.5.4-1
|
||||
Provides: cryptominisat4-devel = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
Header files for developing applications that use %{name}.
|
||||
@ -55,6 +51,10 @@ Header files for developing applications that use %{name}.
|
||||
%package libs
|
||||
Summary: Cryptominisat library
|
||||
|
||||
# This can be removed once Fedora 28 reaches EOL
|
||||
Obsoletes: cryptominisat4-libs < 4.5.4-1
|
||||
Provides: cryptominisat4-libs = %{version}-%{release}
|
||||
|
||||
%description libs
|
||||
The %{name} library.
|
||||
|
||||
@ -62,6 +62,16 @@ The %{name} library.
|
||||
Summary: Python 3 interface to %{name}
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
%{?python_provide:%python_provide python3-%{name}}
|
||||
|
||||
# This can be removed once Fedora 28 reaches EOL
|
||||
Obsoletes: python2-cryptominisat4 < 4.5.4-1
|
||||
Provides: python2-cryptominisat4 = %{version}-%{release}
|
||||
|
||||
# This can be removed once Fedora 29 reaches EOL
|
||||
Obsoletes: python2-%{name} < 5.6.5
|
||||
Provides: python2-%{name} = %{version}-%{release}
|
||||
|
||||
%description -n python3-%{name}
|
||||
Python 3 interface to %{name}.
|
||||
|
||||
@ -73,34 +83,22 @@ if [ "%{_libdir}" = "%{_prefix}/lib64" ]; then
|
||||
sed -i 's,${dir}/lib,&64,g' cmake/FindPkgMacros.cmake
|
||||
fi
|
||||
|
||||
# Remove flags we do not want in Fedora
|
||||
sed -e '/-Wno-class-memaccess/d' \
|
||||
-e '/-mpopcnt/d' \
|
||||
-e '/-msse4.2/d' \
|
||||
-e '/-ggdb3/d' \
|
||||
-i CMakeLists.txt
|
||||
|
||||
# Fix the python install
|
||||
sed -ri 's|install |&--root %{buildroot} |' python/CMakeLists.txt
|
||||
|
||||
# Fix the install directory for cmake files on 64-bit systems
|
||||
if [ "%{_lib}" != "lib" ]; then
|
||||
sed -i 's,lib/cmake,%{_lib}/cmake,' CMakeLists.txt
|
||||
fi
|
||||
|
||||
%build
|
||||
%cmake \
|
||||
-DCMAKE_INSTALL_BINDIR=bin \
|
||||
-DCMAKE_INSTALL_LIBDIR=%{_lib} \
|
||||
-DEXTFEAT:BOOL=ON \
|
||||
-DNOBREAKID:BOOL=ON
|
||||
%cmake_build
|
||||
%cmake . -DCMAKE_INSTALL_LIBDIR=%{_lib}
|
||||
%make_build
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
%make_install
|
||||
|
||||
# Remove an unwanted rpath
|
||||
chrpath -d %{buildroot}%{python3_sitearch}/pycryptosat*.so
|
||||
# Move cmake files to where they should go
|
||||
if [ "%{_lib}" = "lib64" ]; then
|
||||
mv %{buildroot}%{_prefix}/lib/cmake %{buildroot}%{_libdir}
|
||||
sed -i 's|%{_prefix}/lib/|%{_libdir}/|' \
|
||||
%{buildroot}%{_libdir}/cmake/cryptominisat5/*.cmake
|
||||
fi
|
||||
|
||||
%files
|
||||
%doc README.markdown
|
||||
@ -116,7 +114,7 @@ chrpath -d %{buildroot}%{python3_sitearch}/pycryptosat*.so
|
||||
%files libs
|
||||
%doc AUTHORS
|
||||
%license LICENSE.txt
|
||||
%{_libdir}/libcryptominisat5.so.5.8
|
||||
%{_libdir}/libcryptominisat5.so.*
|
||||
|
||||
%files -n python3-%{name}
|
||||
%doc python/README.rst
|
||||
@ -124,87 +122,6 @@ chrpath -d %{buildroot}%{python3_sitearch}/pycryptosat*.so
|
||||
%{python3_sitearch}/pycryptosat*
|
||||
|
||||
%changelog
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 5.8.0-14
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 5.8.0-13
|
||||
- Rebuilt for Boost 1.81
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Tue Jan 17 2023 Jerry James <loganjerry@gmail.com> - 5.8.0-11
|
||||
- Add -include patch for GCC 13 compatibility
|
||||
|
||||
* Mon Dec 19 2022 Jerry James <loganjerry@gmail.com> - 5.8.0-11
|
||||
- Use setuptools instead of distutils (rhbz#2154857)
|
||||
|
||||
* Mon Aug 15 2022 Jerry James <loganjerry@gmail.com> - 5.8.0-10
|
||||
- Convert License tag to SPDX
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 5.8.0-9
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 5.8.0-8
|
||||
- Rebuilt for Boost 1.78
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 5.8.0-6
|
||||
- Rebuilt for Boost 1.76
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 5.8.0-4
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 5.8.0-2
|
||||
- Rebuilt for Boost 1.75
|
||||
|
||||
* Fri Nov 27 2020 Jerry James <loganjerry@gmail.com> - 5.8.0-1
|
||||
- Version 5.8.0
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Thu May 28 2020 Jonathan Wakely <jwakely@redhat.com> - 5.7.1-3
|
||||
- Rebuilt for Boost 1.73
|
||||
|
||||
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 5.7.1-2
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Thu May 7 2020 Jerry James <loganjerry@gmail.com> - 5.7.1-1
|
||||
- Version 5.7.1
|
||||
|
||||
* Sat Apr 25 2020 Jerry James <loganjerry@gmail.com> - 5.7.0-1
|
||||
- Version 5.7.0
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.8-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Jan 27 2020 Jerry James <loganjerry@gmail.com> - 5.6.8-5
|
||||
- Rebuild for m4ri 20200125
|
||||
|
||||
* Thu Jan 16 2020 Jerry James <loganjerry@gmail.com> - 5.6.8-4
|
||||
- Rebuild for m4ri 20200115
|
||||
|
||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 5.6.8-3
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Feb 19 2019 Jerry James <loganjerry@gmail.com> - 5.6.8-1
|
||||
- New upstream release
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (cryptominisat-5.8.0.tar.gz) = 3eb954f01524b189a8de57a05f6060471a083addc4b9077c1e32b769d26393ce3d33468819ba8169deedce43fc3663b0ad8bbad95c6afe5e562e438c57b75496
|
||||
SHA512 (cryptominisat-5.6.8.tar.gz) = 046d6ec830d843561f109d7b3c88f8c012072f1a9192d1128d0f3c70b8181d7754e15973329c78f88a94beee0e57e28ed35921546f6a5ad8029d9f903377dcfa
|
||||
|
||||
Loading…
Reference in New Issue
Block a user