New upstream version.

sources

@@ -1 +1 @@
-SHA512 (Z3-4.8.5.tar.gz) = ca36e1a0332bd473a64f41dfdb31656fb3486178473e4fd4934dccce109a84c9686c08f94998df74bacb588eb12ea5db25dc17a564ee76f82fd2559349697309
+SHA512 (z3-4.8.6.tar.gz) = d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1

z3.spec

@@ -1,13 +1,13 @@
-%global medtag   d6df51951f4c
+%global medtag  78ed71b8de7d
 
 Name:           z3
-Version:        4.8.5
-Release:        6%{?dist}
+Version:        4.8.6
+Release:        1%{?dist}
 Summary:        Satisfiability Modulo Theories (SMT) solver
 
 License:        MIT
 URL:            https://github.com/Z3Prover/z3
-Source0:        https://github.com/Z3Prover/z3/archive/Z3-%{version}.tar.gz
+Source0:        https://github.com/Z3Prover/z3/archive/%{name}-%{version}.tar.gz
 
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
@@ -88,13 +88,13 @@ Provides:       python2-%{name} = 4.8
 Python 3 interface to z3.
 
 %prep
-%setup -q -n %{name}-Z3-%{version}
+%setup -q -n %{name}-%{name}-%{version}
 
 # Install python objects into the right place, enable verbose builds, use
 # Fedora CFLAGS, preserve timestamps when installing, include the entire
 # contents of the archives in the library, link the library with the correct
-# flags, don't hide library symbols needed by the executable, use an soname,
-# and build the ocaml files with debug info.
+# flags, don't hide library symbols needed by the executable, add a version to
+# the soname, and build the ocaml files with debug info.
 sed -e "s|^\(PYTHON_PACKAGE_DIR=\).*|\1'%{python3_sitearch}'|" \
   -e 's/@$(CXX)/$(CXX)/' \
   -e '/O3/d' \
@@ -102,14 +102,13 @@ sed -e "s|^\(PYTHON_PACKAGE_DIR=\).*|\1'%{python3_sitearch}'|" \
   -e "s/\(SLIBEXTRAFLAGS = '\)'/\1-Wl,--no-whole-archive -Wl,--as-needed'/" \
   -e "/SLIBFLAGS/s|-shared|& $RPM_LD_FLAGS -Wl,--whole-archive|" \
   -e 's/\(libz3$(SO_EXT)\)\(\\n\)/\1 -Wl,--no-whole-archive\2/' \
-  -e "s/'tstomp\.cpp',/& '-fPIC',/" \
   -e 's/ -fvisibility=hidden//' \
-  -e '/dll_file/s/\$(SLINK_FLAGS)/& -Wl,-h,lib%{name}.so.0/' \
+  -e "s/\(soname,libz3\.so\)'/\1.0'/" \
   -e "s/OCAML_FLAGS = ''/OCAML_FLAGS = '-g'/" \
   -i scripts/mk_util.py
 
 # Comply with the Java packaging guidelines
-sed -e 's,\(System\.load\)Library("\(.*\)"),\1("%{_libdir}/z3/\2.so"),' \
+sed -e '/catch/s,\(System\.load\)Library("\(.*\)"),\1("%{_libdir}/z3/\2.so"),' \
     -i scripts/update_api.py
 
 # Fix character encoding
@@ -117,12 +116,8 @@ iconv -f iso8859-1 -t utf-8 RELEASE_NOTES > RELEASE_NOTES.utf8
 touch -r RELEASE_NOTES RELEASE_NOTES.utf8
 mv -f RELEASE_NOTES.utf8 RELEASE_NOTES
 
-# Fix permissions
-find -O3 src -type f -perm /0111 \( -name \*.cpp -o -name \*.h \) \
-  -exec chmod 0644 {} +
-
 %build
-export CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
+export CXXFLAGS="$RPM_OPT_FLAGS"
 export LANG="C.UTF-8"
 export PYTHON="%{__python3}"
 
@@ -137,7 +132,7 @@ pushd build
 mv libz3.so libz3.so.0.0.0
 ln -s libz3.so.0.0.0 libz3.so.0
 ln -s libz3.so.0 libz3.so
-g++ $RPM_OPT_FLAGS -fopenmp -o z3 shell/*.o $RPM_LD_FLAGS -L. -lz3 -lgmp
+g++ $RPM_OPT_FLAGS -DNDEBUG -o z3 shell/*.o $RPM_LD_FLAGS -L. -lz3 -lgmp
 popd
 
 # Build the documentation
@@ -177,14 +172,10 @@ mv %{buildroot}%{_prefix}/lib/lib%{name}java.so %{buildroot}%{_libdir}/%{name}
 
 #%%check
 # Some of the tests require more memory than the koji builders have available.
-# However, valgrind also shows a large number of memory leaks.  I will work
-# with upstream to fix the leaks, then try again to see if the tests can be
-# run on the koji builders successfully.  If not, the tests will have to be run
-# manually on machines with more available memory.
 #
 #export LANG="C.UTF-8"
 #pushd build
-#make test
+#make test-z3
 #./test-z3 /a
 #popd
 
@@ -226,6 +217,9 @@ mv %{buildroot}%{_prefix}/lib/lib%{name}java.so %{buildroot}%{_libdir}/%{name}
 %{python3_sitearch}/%{name}/
 
 %changelog
+* Fri Sep 20 2019 Jerry James <loganjerry@gmail.com> - 4.8.6-1
+- New upstream version
+
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 4.8.5-6
 - Rebuilt for Python 3.8