diff --git a/labltk-8.06.0-enable-debugging.patch b/labltk-8.06.11-enable-debugging.patch similarity index 37% rename from labltk-8.06.0-enable-debugging.patch rename to labltk-8.06.11-enable-debugging.patch index 7e968116877458e492f974d07e5b9288c5c38a79..71d64a52334b0d7b84e9a18894f1e41bf2e536c6 100644 --- a/labltk-8.06.0-enable-debugging.patch +++ b/labltk-8.06.11-enable-debugging.patch @@ -1,19 +1,32 @@ ---- 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 +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) +-CAMLOPT=$(BINDIR)/ocamlopt$(OPT) $(WARNERR) -CAMLCB=$(BINDIR)/ocamlc -CAMLOPTB=$(BINDIR)/ocamlopt --CAMLCOMP=$(CAMLC) -c -warn-error A-3 +-CAMLCOMP=$(CAMLC) -c $(WARNERR) +CAMLC=$(BINDIR)/ocamlc$(OPT) -g -+CAMLOPT=$(BINDIR)/ocamlopt$(OPT) -g ++CAMLOPT=$(BINDIR)/ocamlopt$(OPT) $(WARNERR) -g +CAMLCB=$(BINDIR)/ocamlc -g +CAMLOPTB=$(BINDIR)/ocamlopt -g -+CAMLCOMP=$(CAMLC) -c -warn-error A-3 -g ++CAMLCOMP=$(CAMLC) -c $(WARNERR) -g CAMLYACC=$(BINDIR)/ocamlyacc -v CAMLLEX=$(BINDIR)/ocamllex -CAMLLIBR=$(CAMLC) -a diff --git a/labltk-8.06.11.tar.gz b/labltk-8.06.11.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..90fbccb596230494873f6baebfc13c16e2fa1a3e Binary files /dev/null and b/labltk-8.06.11.tar.gz differ 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 f2a02e41a76f1c152c4007257ab6a22d1333d213..0000000000000000000000000000000000000000 --- 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/labltk-8.06.4.tar.gz b/labltk-8.06.4.tar.gz deleted file mode 100644 index 70059a954f10d399ed64a44d3b1360933dfc3450..0000000000000000000000000000000000000000 Binary files a/labltk-8.06.4.tar.gz and /dev/null differ diff --git a/labltk.spec b/labltk.spec index 2762818865a1375e3034c5913b53cd77b39f7f3a..82a82e0757cc6cf680cf221016380b189e138b4c 100644 --- a/labltk.spec +++ b/labltk.spec @@ -4,15 +4,14 @@ %global native_compiler 0 %endif Name: ocaml-labltk -Version: 8.06.4 +Version: 8.06.11 Release: 1 Summary: Tcl/Tk interface for OCaml License: LGPLv2+ with exceptions URL: https://github.com/garrigue/labltk -Source0: https://github.com/garrigue/labltk/archive/labltk-%{version}/labltk-%{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: ocaml tcl-devel tk-devel %description labltk or mlTk is a library for interfacing OCaml with the scripting @@ -27,9 +26,8 @@ language Tcl/Tk (all versions since 8.0.3, but no betas). This package contains the development files. %prep -%setup -q -n labltk-labltk-%{version} +%setup -q -n labltk-%{version} %patch1 -p1 -%patch2 -p1 find -name .gitignore -delete find -type f | xargs sed -i -e 's/-warn-error/-w/g' @@ -81,5 +79,8 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk %{_libdir}/ocaml/labltk/*.mli %changelog +* Thu Jan 20 2022 liyanan -8.06.11-1 +- update to 8.06.11 + * Fri Oct 9 2020 maminjie - 8.06.4-1 - package init