Version 4.8.9.

This commit is contained in:
Jerry James 2020-09-11 10:11:15 -06:00
parent 47902ea172
commit b42ca529b7
2 changed files with 20 additions and 7 deletions

View File

@ -1 +1 @@
SHA512 (z3-4.8.8.tar.gz) = a6823cadb7cdad11b8f0db1530676c0ec4853886dfb3c4dbc5b798c5dbd445afb0c61675f81cb7f99c1b1734d9cd0ec96a07c68a948da3c25801fc6767fea47f
SHA512 (z3-4.8.9.tar.gz) = a50da5c3f9e27d3e804c1b71f648a3dbd5a55223b7344d66f191a1b34a4d787810abd976840d3ab3878aaf5c96d89f5a517cac0781b82aa927a9d8d54836d54f

25
z3.spec
View File

@ -1,6 +1,6 @@
Name: z3
Version: 4.8.8
Release: 7%{?dist}
Version: 4.8.9
Release: 1%{?dist}
Summary: Satisfiability Modulo Theories (SMT) solver
License: MIT
@ -12,6 +12,7 @@ BuildRequires: doxygen
BuildRequires: gcc-c++
BuildRequires: gmp-devel
BuildRequires: graphviz
BuildRequires: help2man
BuildRequires: java-devel
BuildRequires: javapackages-tools
BuildRequires: ninja-build
@ -99,12 +100,15 @@ sed \
-i scripts/mk_util.py
# Comply with the Java packaging guidelines
sed -e '/catch/s,\(System\.load\)Library("\(.*\)"),\1("%{_libdir}/z3/\2.so"),' \
sed -e '/libz3java/s,\(System\.load\)Library("\(.*\)"),\1("%{_libdir}/z3/\2.so"),' \
-i scripts/update_api.py
# Update an OCaml interface
sed -i 's/Pervasives/Stdlib/' src/api/ml/z3.ml
# FIXME: For unknown reasons, cmake replaces the version with nothing at all
sed -i 's/@VERSION@/%{version}/' z3.pc.cmake.in
# Fix character encoding
iconv -f iso8859-1 -t utf-8 RELEASE_NOTES > RELEASE_NOTES.utf8
touch -r RELEASE_NOTES RELEASE_NOTES.utf8
@ -113,7 +117,7 @@ mv -f RELEASE_NOTES.utf8 RELEASE_NOTES
%build
export CXXFLAGS="$RPM_OPT_FLAGS"
export LANG="C.UTF-8"
export PYTHON="%{__python3}"
export PYTHON="%{python3}"
%cmake -G Ninja \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/%{name} \
@ -135,7 +139,7 @@ export PYTHON="%{__python3}"
# Second, to prevent make from rebuilding the entire library, copy the
# cmake-built library to where make expects it.
cp -dp %{__cmake_builddir}/libz3.so* build
cp -dp %{_vpath_builddir}/libz3.so* build
# Third, make wants to rebuild libz3.so since its dependencies do not exist.
# Do selective Makefile surgery to prevent this.
@ -168,6 +172,10 @@ popd
# We handle the documentation files below
rm -rf %{buildroot}%{_docdir}/Z3
# Make a man page
mkdir -p %{buildroot}%{_mandir}/man1
help2man -N -o %{buildroot}%{_mandir}/man1/%{name}.1 %{_vpath_builddir}/%{name}
#%%check
# Some of the tests require more memory than the koji builders have available.
#
@ -180,6 +188,7 @@ rm -rf %{buildroot}%{_docdir}/Z3
%files
%doc README.md RELEASE_NOTES
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*
%files libs
%license LICENSE.txt
@ -189,9 +198,10 @@ rm -rf %{buildroot}%{_docdir}/Z3
%{_includedir}/%{name}/
%{_libdir}/lib%{name}.so
%{_libdir}/cmake/%{name}/
%{_libdir}/pkgconfig/%{name}.pc
%files doc
%doc %{__cmake_builddir}/doc/api/html examples
%doc %{_vpath_builddir}/doc/api/html examples
%license LICENSE.txt
%files -n java-%{name}
@ -216,6 +226,9 @@ rm -rf %{buildroot}%{_docdir}/Z3
%{python3_sitelib}/%{name}/
%changelog
* Fri Sep 11 2020 Jerry James <loganjerry@gmail.com> - 4.8.9-1
- Version 4.8.9
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 4.8.8-7
- OCaml 4.11.1 rebuild