From 1cf0dc459f350f3d6bd19c8cb8e96a48d90712f9 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 29 Apr 2019 17:10:29 +0100
Subject: [PATCH] New upstream version 8.06.5.

---
 .gitignore        |  1 +
 ocaml-labltk.spec | 22 +++++++++++++++-------
 sources           |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 21f0326..5791030 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /labltk-8.06.2.tar.gz
 /labltk-8.06.3.tar.gz
 /labltk-8.06.4.tar.gz
+/labltk-8.06.5.tar.gz
diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 77d5702..46187a6 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -5,15 +5,15 @@
 %endif
 
 Name:          ocaml-labltk
-Version:       8.06.4
-Release:       9%{?dist}
+Version:       8.06.5
+Release:       1%{?dist}
 
 Summary:       Tcl/Tk interface for OCaml
 
 License:       LGPLv2+ with exceptions
 
 URL:           https://forge.ocamlcore.org/projects/labltk/
-Source0:       https://forge.ocamlcore.org/frs/download.php/1727/labltk-8.06.4.tar.gz
+Source0:       https://forge.ocamlcore.org/frs/download.php/1727/labltk-%{version}.tar.gz
 
 # This adds debugging (-g) everywhere.
 Patch1:        labltk-8.06.0-enable-debugging.patch
@@ -53,6 +53,11 @@ find -name .gitignore -delete
 # Kill -warn-error.
 find -type f | xargs sed -i -e 's/-warn-error/-w/g'
 
+# Don't build ocamlbrowser.
+mv browser browser.old
+mkdir browser
+echo -e 'all:\ninstall:\n' > browser/Makefile
+
 
 %build
 ./configure
@@ -63,8 +68,9 @@ unset MAKEFLAGS
 %if !%{native_compiler}
 make byte
 %else
-make all
-make opt
+make all opt \
+     SHAREDCCCOMPOPTS="%{optflags} -fPIC" \
+     TK_LINK="%{__global_ldflags} -ltk8.6 -ltcl8.6"
 %endif
 
 
@@ -97,7 +103,6 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 %doc examples_camltk
 %doc examples_labltk
 %{_bindir}/labltk
-%{_bindir}/ocamlbrowser
 %{_libdir}/ocaml/labltk/labltktop
 %{_libdir}/ocaml/labltk/pp
 %{_libdir}/ocaml/labltk/tkcompiler
@@ -111,7 +116,10 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
-* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 8.06.4-9
+* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 8.06.5-1
+- New upstream version 8.06.5.
+- Try harder to set CFLAGS and LDFLAGS.
+- Don't build ocamlbrowser.
 - OCaml 4.08.0 (beta 3) rebuild.
 
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.06.4-8
diff --git a/sources b/sources
index 15f40c2..adc94e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (labltk-8.06.4.tar.gz) = 5221d2378f73cbcc2a4abd003023c01c8f0e1a919029ddb06069db30284b0bdef12e03b66b9c7c694c7a2128b060f2f2a5a34e4f3b8eed1060a0880a2e429644
+SHA512 (labltk-8.06.5.tar.gz) = 8a6bfefd1ba8ef1fb54c284a06067007dd48833a475e24c787c0c2100a30a5ab018606ca3e79fd0fa323b6759de0ae3c7e6ef881e662bf1d7f84e920c7bebe7a