From 6bf7a73629836a2a68898b5ad82576ae4eeece31 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 4 Oct 2021 19:09:29 +0100
Subject: [PATCH] Fix Source line. Combine patches into single patch and update
 to latest sources.

---
 labltk-8.06.0-enable-debugging.patch      | 28 ----------------
 labltk-8.06.11-enable-debugging.patch     | 41 +++++++++++++++++++++++
 labltk-8.06.4-enable-more-debugging.patch | 11 ------
 ocaml-labltk.spec                         |  6 ++--
 4 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 labltk-8.06.0-enable-debugging.patch
 create mode 100644 labltk-8.06.11-enable-debugging.patch
 delete mode 100644 labltk-8.06.4-enable-more-debugging.patch

diff --git a/labltk-8.06.0-enable-debugging.patch b/labltk-8.06.0-enable-debugging.patch
deleted file mode 100644
index 7e96811..0000000
--- a/labltk-8.06.0-enable-debugging.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- labltk-8.06.0.old/support/Makefile.common	2014-09-18 05:08:33.000000000 +0100
-+++ labltk-8.06.0/support/Makefile.common	2015-02-16 15:11:30.157186457 +0000
-@@ -21,17 +21,17 @@
- ## Tools from the OCaml distribution
- 
- CAMLRUN=$(BINDIR)/ocamlrun
--CAMLC=$(BINDIR)/ocamlc$(OPT)
--CAMLOPT=$(BINDIR)/ocamlopt$(OPT)
--CAMLCB=$(BINDIR)/ocamlc
--CAMLOPTB=$(BINDIR)/ocamlopt
--CAMLCOMP=$(CAMLC) -c -warn-error A-3
-+CAMLC=$(BINDIR)/ocamlc$(OPT) -g
-+CAMLOPT=$(BINDIR)/ocamlopt$(OPT) -g
-+CAMLCB=$(BINDIR)/ocamlc -g
-+CAMLOPTB=$(BINDIR)/ocamlopt -g
-+CAMLCOMP=$(CAMLC) -c -warn-error A-3 -g
- CAMLYACC=$(BINDIR)/ocamlyacc -v
- CAMLLEX=$(BINDIR)/ocamllex
--CAMLLIBR=$(CAMLC) -a
-+CAMLLIBR=$(CAMLC) -a -g
- CAMLDEP=$(BINDIR)/ocamldep
- COMPFLAGS=-g
- LINKFLAGS=
--CAMLOPTLIBR=$(CAMLOPT) -a
--MKLIB=$(BINDIR)/ocamlmklib
-+CAMLOPTLIBR=$(CAMLOPT) -a -g
-+MKLIB=$(BINDIR)/ocamlmklib -g
- CAMLRUNGEN=$(BINDIR)/ocamlrun
diff --git a/labltk-8.06.11-enable-debugging.patch b/labltk-8.06.11-enable-debugging.patch
new file mode 100644
index 0000000..71d64a5
--- /dev/null
+++ b/labltk-8.06.11-enable-debugging.patch
@@ -0,0 +1,41 @@
+diff -ur labltk-8.06.11.old/support/Makefile labltk-8.06.11/support/Makefile
+--- labltk-8.06.11.old/support/Makefile	2021-10-04 19:10:57.000196523 +0100
++++ labltk-8.06.11/support/Makefile	2021-10-04 19:18:06.263137991 +0100
+@@ -28,7 +28,7 @@
+       cltkFile.$(O) cltkMain.$(O) cltkMisc.$(O) cltkTimer.$(O) \
+       cltkVar.$(O) cltkWait.$(O) cltkImg.$(O)
+ 
+-CCFLAGS=-I$(LIBDIR)/caml $(TK_DEFS) $(SHAREDCCCOMPOPTS)
++CCFLAGS=-I$(LIBDIR)/caml $(TK_DEFS) $(SHAREDCCCOMPOPTS) -g
+ 
+ COMPFLAGS=
+ THFLAGS=-I +threads -I vmthreads
+diff -ur labltk-8.06.11.old/support/Makefile.common labltk-8.06.11/support/Makefile.common
+--- labltk-8.06.11.old/support/Makefile.common	2021-10-04 19:10:56.990196618 +0100
++++ labltk-8.06.11/support/Makefile.common	2021-10-04 19:18:06.264137981 +0100
+@@ -21,17 +21,17 @@
+ ## Tools from the OCaml distribution
+ 
+ CAMLRUN=$(BINDIR)/ocamlrun
+-CAMLC=$(BINDIR)/ocamlc$(OPT)
+-CAMLOPT=$(BINDIR)/ocamlopt$(OPT) $(WARNERR)
+-CAMLCB=$(BINDIR)/ocamlc
+-CAMLOPTB=$(BINDIR)/ocamlopt
+-CAMLCOMP=$(CAMLC) -c $(WARNERR)
++CAMLC=$(BINDIR)/ocamlc$(OPT) -g
++CAMLOPT=$(BINDIR)/ocamlopt$(OPT) $(WARNERR) -g
++CAMLCB=$(BINDIR)/ocamlc -g
++CAMLOPTB=$(BINDIR)/ocamlopt -g
++CAMLCOMP=$(CAMLC) -c $(WARNERR) -g
+ CAMLYACC=$(BINDIR)/ocamlyacc -v
+ CAMLLEX=$(BINDIR)/ocamllex
+-CAMLLIBR=$(CAMLC) -a
++CAMLLIBR=$(CAMLC) -a -g
+ CAMLDEP=$(BINDIR)/ocamldep
+ COMPFLAGS=-g
+ LINKFLAGS=
+-CAMLOPTLIBR=$(CAMLOPT) -a
+-MKLIB=$(BINDIR)/ocamlmklib
++CAMLOPTLIBR=$(CAMLOPT) -a -g
++MKLIB=$(BINDIR)/ocamlmklib -g
+ CAMLRUNGEN=$(BINDIR)/ocamlrun
diff --git a/labltk-8.06.4-enable-more-debugging.patch b/labltk-8.06.4-enable-more-debugging.patch
deleted file mode 100644
index f2a02e4..0000000
--- a/labltk-8.06.4-enable-more-debugging.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- labltk-8.06.4.old/support/Makefile	2017-10-30 09:19:07.000000000 +0000
-+++ labltk-8.06.4/support/Makefile	2017-11-07 21:24:58.244605912 +0000
-@@ -28,7 +28,7 @@
-       cltkFile.$(O) cltkMain.$(O) cltkMisc.$(O) cltkTimer.$(O) \
-       cltkVar.$(O) cltkWait.$(O) cltkImg.$(O)
- 
--CCFLAGS=-I$(LIBDIR)/caml $(TK_DEFS) $(SHAREDCCCOMPOPTS)
-+CCFLAGS=-I$(LIBDIR)/caml $(TK_DEFS) $(SHAREDCCCOMPOPTS) -g
- 
- COMPFLAGS=
- THFLAGS=-I +threads -I vmthreads
diff --git a/ocaml-labltk.spec b/ocaml-labltk.spec
index 904cdd7..7e42b15 100644
--- a/ocaml-labltk.spec
+++ b/ocaml-labltk.spec
@@ -13,11 +13,10 @@ Summary:       Tcl/Tk interface for OCaml
 License:       LGPLv2+ with exceptions
 
 URL:           https://github.com/garrigue/labltk
-Source0:       https://github.com/garrigue/labltk/archive/%{version}.tar.gz
+Source0:       https://github.com/garrigue/labltk/archive/%{version}/labltk-%{version}.tar.gz
 
 # This adds debugging (-g) everywhere.
-Patch1:        labltk-8.06.0-enable-debugging.patch
-Patch2:        labltk-8.06.4-enable-more-debugging.patch
+Patch1:        labltk-8.06.11-enable-debugging.patch
 
 BuildRequires: make
 BuildRequires: ocaml
@@ -46,7 +45,6 @@ This package contains the development files.
 %setup -q -n labltk-%{version}
 
 %patch1 -p1
-%patch2 -p1
 
 # Remove version control files which might get copied into documentation.
 find -name .gitignore -delete