From 07cfc11f6bb2b656753eb949906c6bf3756c279bb4b30b7ff8ab33148c3fad83 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Fri, 8 Feb 2019 09:04:47 +0000
Subject: [PATCH] Accepting request 672630 from
 home:onthewings:branches:devel:languages:ocaml

Remove ocaml-cppo-1.6.1-install-args.patch and directly call dune in the install section.

OBS-URL: https://build.opensuse.org/request/show/672630
OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-cppo?expand=0&rev=42
---
 ocaml-cppo-1.6.1-install-args.patch | 12 ------------
 ocaml-cppo.changes                  |  6 ++++++
 ocaml-cppo.spec                     |  5 +----
 3 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 ocaml-cppo-1.6.1-install-args.patch

diff --git a/ocaml-cppo-1.6.1-install-args.patch b/ocaml-cppo-1.6.1-install-args.patch
deleted file mode 100644
index 848b8cf..0000000
--- a/ocaml-cppo-1.6.1-install-args.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ocaml-cppo-1.6.1/Makefile.orig ocaml-cppo-1.6.1/Makefile
---- ocaml-cppo-1.6.1/Makefile.orig	2018-01-31 23:28:37.944255913 +0100
-+++ ocaml-cppo-1.6.1/Makefile	2018-01-31 23:28:49.284256383 +0100
-@@ -5,7 +5,7 @@ test:
- 	@jbuilder runtest
- 
- install:
--	@jbuilder install
-+	@jbuilder install $(INSTALL_ARGS)
- 
- uninstall:
- 	@jbuilder uninstall
diff --git a/ocaml-cppo.changes b/ocaml-cppo.changes
index 6fa218f..4a7d7e1 100644
--- a/ocaml-cppo.changes
+++ b/ocaml-cppo.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb  8 01:35:59 UTC 2019 - andy@onthewings.net
+
+- Remove ocaml-cppo-1.6.1-install-args.patch and directly call dune
+  in the install section. 
+
 -------------------------------------------------------------------
 Tue Feb  5 18:39:39 UTC 2019 - andy@onthewings.net
 
diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec
index 372062f..4d53feb 100644
--- a/ocaml-cppo.spec
+++ b/ocaml-cppo.spec
@@ -31,8 +31,6 @@ License:        BSD-3-Clause
 Group:          Development/Languages/OCaml
 Url:            https://github.com/ocaml-community/cppo
 Source:         %{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTEAM ocaml-cppo-1.6.1-install-args.patch -- Allows to pass buildroot to opam-installer
-Patch:          ocaml-cppo-1.6.1-install-args.patch
 BuildRequires:  ocaml
 BuildRequires:  ocaml-dune
 BuildRequires:  ocaml-ocamldoc
@@ -69,7 +67,6 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch -p1
 
 %build
 dune build @install --profile release
@@ -77,7 +74,7 @@ dune build @install --profile release
 %install
 %if %{with opam}
   install -d %{buildroot}%{_libdir}/ocaml
-  %make_install INSTALL_ARGS="--prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir}/ocaml"
+  dune install --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir}/ocaml
   rm -r %{buildroot}%{_prefix}/doc
 %else
   # By hand, not funny