From d8cdce15e8a9b6fa4fc2e1f1d35adb583681dc2c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 20 Aug 2019 15:09:32 +0100
Subject: [PATCH] New upstream version 0.6.

---
 .gitignore                            |  1 +
 0001-Use-ocamlopt-g-option.patch      | 28 +++++++++++++++++++++++++++
 ocaml-augeas-0.5-use-ocamlopt-g.patch | 13 -------------
 ocaml-augeas.spec                     | 13 ++++++++-----
 sources                               |  2 +-
 5 files changed, 38 insertions(+), 19 deletions(-)
 create mode 100644 0001-Use-ocamlopt-g-option.patch
 delete mode 100644 ocaml-augeas-0.5-use-ocamlopt-g.patch

diff --git a/.gitignore b/.gitignore
index 920b22e..3cfc1a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 ocaml-augeas-0.4.tar.gz
 /ocaml-augeas-0.5.tar.gz
+/ocaml-augeas-0.6.tar.gz
diff --git a/0001-Use-ocamlopt-g-option.patch b/0001-Use-ocamlopt-g-option.patch
new file mode 100644
index 0000000..f263e30
--- /dev/null
+++ b/0001-Use-ocamlopt-g-option.patch
@@ -0,0 +1,28 @@
+From 56c0602e972f1fae336198eb9587d71f1e36daff Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 20 Aug 2019 15:06:57 +0100
+Subject: [PATCH] Use ocamlopt -g option.
+
+Originally from Fedora.
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e01385f..4ae5ef5 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -34,8 +34,8 @@ LIBS		= @AUGEAS_LIBS@ @LIBXML2_LIBS@ @LIBS@
+ 
+ OCAMLCFLAGS	= -g
+ OCAMLCPACKAGES	=
+-OCAMLOPTFLAGS	=
+-OCAMLOPTPACKAGES =
++OCAMLOPTFLAGS	= $(OCAMLCFLAGS)
++OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
+ 
+ OCAMLDOCFLAGS	= -html -sort
+ 
+-- 
+2.22.0
+
diff --git a/ocaml-augeas-0.5-use-ocamlopt-g.patch b/ocaml-augeas-0.5-use-ocamlopt-g.patch
deleted file mode 100644
index f39110d..0000000
--- a/ocaml-augeas-0.5-use-ocamlopt-g.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ocaml-augeas-0.5/Makefile.in.old	2012-06-11 14:02:39.000000000 +0100
-+++ ocaml-augeas-0.5/Makefile.in	2013-09-14 11:29:45.133175512 +0100
-@@ -33,8 +33,8 @@
- 
- OCAMLCFLAGS	= -g
- OCAMLCPACKAGES	=
--OCAMLOPTFLAGS	=
--OCAMLOPTPACKAGES =
-+OCAMLOPTFLAGS	= $(OCAMLCFLAGS)
-+OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
- 
- OCAMLDOCFLAGS	= -html -sort
- 
diff --git a/ocaml-augeas.spec b/ocaml-augeas.spec
index dac1594..a1e5a3a 100644
--- a/ocaml-augeas.spec
+++ b/ocaml-augeas.spec
@@ -1,15 +1,16 @@
 %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 
 Name:           ocaml-augeas
-Version:        0.5
-Release:        37%{?dist}
+Version:        0.6
+Release:        1%{?dist}
 Summary:        OCaml bindings for Augeas configuration API
 License:        LGPLv2+ with exceptions
 
 URL:            http://people.redhat.com/~rjones/augeas/files/
 Source0:        http://people.redhat.com/~rjones/augeas/files/%{name}-%{version}.tar.gz
 
-Patch1:         ocaml-augeas-0.5-use-ocamlopt-g.patch
+# Upstream patch to enable debuginfo.
+Patch1:         0001-Use-ocamlopt-g-option.patch
 
 BuildRequires:  ocaml >= 3.09.0
 BuildRequires:  ocaml-findlib-devel
@@ -34,8 +35,7 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q
-%patch1 -p1
+%autosetup -p1
 
 
 %build
@@ -93,6 +93,9 @@ chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so
 
 
 %changelog
+* Tue Aug 20 2019 Richard W.M. Jones <rjones@redhat.com> - 0.6-1
+- New upstream version 0.6.
+
 * Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 0.5-37
 - OCaml 4.08.1 (final) rebuild.
 
diff --git a/sources b/sources
index 6ef7a65..f55c17d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-900bf68677eba3bec1972b3ed2e8ad94  ocaml-augeas-0.5.tar.gz
+SHA512 (ocaml-augeas-0.6.tar.gz) = e747f5c09d3821b41d98e3f12c8dfe9bb13a69d6ccaaf954f4bb33e8e4d9d62603ae26fe9f93f10b2705872526b1863a1c20e0c8a53858fdf60f8cb8cbf50b7a