From 048436281a1d564e69a22e7c1cccb8084d5cd067 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Wed, 13 Jul 2016 15:07:47 -0600
Subject: [PATCH] Fix Java interface (bz 1353773).

---
 z3.spec | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/z3.spec b/z3.spec
index d51bcaa..dfc6d44 100644
--- a/z3.spec
+++ b/z3.spec
@@ -8,7 +8,7 @@
 
 Name:           z3
 Version:        4.4.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Satisfiability Modulo Theories (SMT) solver
 
 License:        MIT
@@ -114,7 +114,7 @@ sed -e "s|^\(PYTHON_PACKAGE_DIR=\).*|\1'%{python2_sitearch}/z3'|" \
   -e 's/\(libz3$(SO_EXT)\)\(\\n\)/\1 -Wl,--no-whole-archive\2/' \
   -e "s/'tstomp\.cpp',/& '-fPIC',/" \
   -e 's/ -fvisibility=hidden//' \
-  -e 's/-shared/& -Wl,-h,lib%{name}.so.0/' \
+  -e '/dllfile/s/\$(SLINK_FLAGS)/& -Wl,-h,lib%{name}.so.0/' \
   -i scripts/mk_util.py
 
 # Do not try to build with SSE2 support on non-x86_64 arches.
@@ -123,7 +123,8 @@ sed -i 's/exec_compiler_cmd.*-msse.*:/None:/' scripts/mk_util.py
 %endif
 
 # Comply with the Java packaging guidelines
-sed -i "s/\(System\.load\)Library/\1/" scripts/update_api.py
+sed -e 's,\(System\.load\)Library("\([^"]*\)"),\1("%{_libdir}/z3/\2.so"),' \
+    -i scripts/update_api.py
 
 # Fix character encoding
 iconv -f iso8859-1 -t utf-8 RELEASE_NOTES > RELEASE_NOTES.utf8
@@ -132,8 +133,8 @@ mv -f RELEASE_NOTES.utf8 RELEASE_NOTES
 
 # Fix permissions
 chmod a-x examples/interp/iz3.cpp
-find -O3 src -type f -perm /0111 \( -name \*.cpp -o -name \*.h \) | \
-  xargs chmod 0644
+find -O3 src -type f -perm /0111 \( -name \*.cpp -o -name \*.h \) \
+  -exec chmod 0644 {} +
 
 # Fix ocaml documentation generation (broken in 4.4.0)
 sed -i 's,api\\html\\ml,api/html/ml,' doc/mk_api_doc.py
@@ -266,6 +267,9 @@ chmod 0755 %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/*.so.0.0.0 \
 %{python2_sitearch}/%{name}/
 
 %changelog
+* Wed Jul 13 2016 Jerry James <loganjerry@gmail.com> - 4.4.1-6
+- Fix Java interface (bz 1353773)
+
 * Thu Jun 30 2016 Jerry James <loganjerry@gmail.com> - 4.4.1-5
 - Fix __init__.py (bz 1351580)