diff --git a/sources b/sources index 8afe937..e96d62e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (z3-4.11.2.tar.gz) = be2573d38c0e50b46fcb025d50335e016769fdeab3c26f5dc2a13102fae889d23039258ea8d38de3f53daa4cf073704d8639ac291e781a74633194adedaae21a +SHA512 (z3-4.12.0.tar.gz) = 53a51c8304fa4356d13293f68b14d9d9eef57a0771c6698d38aea5fac62c4e52c41ff003cb6d771a32645d2aa4ef59be5f792f2efbee927d06ac8280094976e5 diff --git a/z3-data-race.patch b/z3-data-race.patch deleted file mode 100644 index 547b48c..0000000 --- a/z3-data-race.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- z3-z3-4.11.2/src/solver/parallel_tactic.cpp.orig 2022-09-03 16:47:12.000000000 -0600 -+++ z3-z3-4.11.2/src/solver/parallel_tactic.cpp 2023-01-08 21:39:29.169670155 -0700 -@@ -460,6 +460,7 @@ private: - conquer->get_model(mdl); - } - else { -+ std::lock_guard lock(m_mutex); - s.get_solver().get_model(mdl); - } - if (mdl) { diff --git a/z3-uninit.patch b/z3-uninit.patch deleted file mode 100644 index fc3623c..0000000 --- a/z3-uninit.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- z3-z3-4.11.2/src/sat/sat_lookahead.cpp.orig 2022-09-03 16:47:12.000000000 -0600 -+++ z3-z3-4.11.2/src/sat/sat_lookahead.cpp 2023-01-06 15:09:19.198322817 -0700 -@@ -1001,6 +1001,7 @@ namespace sat { - m_inconsistent = false; - m_qhead = 0; - m_bstamp_id = 0; -+ m_istamp_id = 0; - - for (unsigned i = 0; i < m_num_vars; ++i) { - init_var(i); diff --git a/z3.spec b/z3.spec index 9328599..67526af 100644 --- a/z3.spec +++ b/z3.spec @@ -15,8 +15,8 @@ %bcond_with test Name: z3 -Version: 4.11.2 -Release: 2%{?dist} +Version: 4.12.0 +Release: 1%{?dist} Summary: Satisfiability Modulo Theories (SMT) solver License: MIT @@ -24,10 +24,6 @@ URL: https://github.com/Z3Prover/z3 Source0: https://github.com/Z3Prover/z3/archive/%{name}-%{version}.tar.gz # Change the way python finds the shared object; see bz 1910923 Patch0: %{name}-python.patch -# Fix use of an uninitialized variable -Patch1: %{name}-uninit.patch -# Fix a data race that can cause a segfault; see bz 2157972 -Patch2: %{name}-data-race.patch BuildRequires: cmake BuildRequires: doxygen @@ -171,6 +167,9 @@ sed -e '/libz3java/s,\(System\.load\)Library("\(.*\)"),\1("%{_libdir}/z3/\2.so") -e "s/@MAJVER@/$majver/" \ -i scripts/update_api.py +# Turn off HTML timestamps for reproducible builds +sed -i '/HTML_TIMESTAMP/s/YES/NO/' doc/z3api.cfg.in doc/z3code.dox + %build export LANG=C.UTF-8 export PYTHON=%{python3} @@ -236,6 +235,9 @@ rm -rf %{buildroot}%{_docdir}/Z3 mkdir -p %{buildroot}%{_mandir}/man1 help2man -N -o %{buildroot}%{_mandir}/man1/z3.1 %{_vpath_builddir}/z3 +# Fix the pkgconfig file +sed -i 's,//usr,,' %{buildroot}%{_libdir}/pkgconfig/z3.pc + %if %{with test} %check export LANG="C.UTF-8" @@ -252,7 +254,7 @@ cd - %files libs %license LICENSE.txt -%{_libdir}/libz3.so.4.11* +%{_libdir}/libz3.so.4.12* %files devel %{_includedir}/z3/ @@ -288,6 +290,10 @@ cd - %{python3_sitelib}/z3/ %changelog +* Tue Jan 17 2023 Jerry James - 4.12.0-1 +- Version 4.12.0 +- Drop upstreamed -data-race and -uninit patches + * Sun Jan 8 2023 Jerry James - 4.11.2-2 - Add -data-race patch to fix segfault (bz 2157972) - Add -uninit patch to fix use of an uninitialized value