From 682eaa84192a069234d9cfb98097cb470bcff20f4c72fa796eff61601748828f Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Thu, 28 Jan 2021 13:08:16 +0000
Subject: [PATCH] ocaml-jsonm.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-jsonm?expand=0&rev=13
---
 ocaml-jsonm.changes      | 40 ++--------------------------------------
 ocaml-jsonm.spec         | 10 ++++++----
 _service                 | 11 +++++++----
 ocaml-jsonm-1.0.1.tar.xz |  4 ++--
 ocaml-jsonm.patch        | 14 ++++++++++++++
 5 files changed, 31 insertions(+), 48 deletions(-)
 create mode 100644 ocaml-jsonm.patch

diff --git a/ocaml-jsonm.changes b/ocaml-jsonm.changes
index 446f1fb..2ec2bf4 100644
--- a/ocaml-jsonm.changes
+++ b/ocaml-jsonm.changes
@@ -1,41 +1,5 @@
 -------------------------------------------------------------------
-Fri Nov  1 12:34:56 UTC 2019 - ohering@suse.de
+Thu Jan 21 21:21:21 UTC 2021 - ohering@suse.de
 
-- Require current dune macros
-- Use _service file
-
--------------------------------------------------------------------
-Fri Apr 20 08:15:14 UTC 2018 - andy@onthewings.net
-
-- Fix Source: url. 
-
--------------------------------------------------------------------
-Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de
-
-- Use Group: Development/Languages/OCaml
-
--------------------------------------------------------------------
-Mon Jul 17 12:48:58 UTC 2017 - ohering@suse.de
-
-- Wrap specfile conditionals to fix quilt setup
-
--------------------------------------------------------------------
-Wed May 31 07:07:33 UTC 2017 - olaf@aepfle.de
-
-- Replace tabs with spaces in generated _oasis file
-
--------------------------------------------------------------------
-Wed May 17 10:34:57 UTC 2017 - olaf@aepfle.de
-
-- Version 1.0.1
-
--------------------------------------------------------------------
-Tue May 16 11:14:08 UTC 2017 - olaf@aepfle.de
-
-- Build with oasis
-
--------------------------------------------------------------------
-Sat Dec 24 17:20:22 UTC 2016 - antoine.belvire@opensuse.org
-
-- Create package ocaml-jsonm-1.0.0
+- Initial version 1.0.1
 
diff --git a/ocaml-jsonm.spec b/ocaml-jsonm.spec
index 186db86..da9d298 100644
--- a/ocaml-jsonm.spec
+++ b/ocaml-jsonm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ocaml-jsonm
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,11 +23,12 @@ Release:        0
 Summary:        Non-blocking streaming JSON codec for OCaml
 License:        ISC
 Group:          Development/Languages/OCaml
-Url:            http://erratique.ch/software/jsonm 
-Source:         %{name}-%{version}.tar.xz
+URL:            https://opam.ocaml.org/packages/jsonm
+Source0:        %{name}-%{version}.tar.xz
+Patch0:         ocaml-jsonm.patch
 BuildRequires:  ocaml
 BuildRequires:  ocaml-dune
-BuildRequires:  ocaml-rpm-macros >= 20191101
+BuildRequires:  ocaml-rpm-macros >= 20210121
 BuildRequires:  ocamlfind(uutf)
 
 %description
@@ -52,6 +53,7 @@ developing applications that use %{name}.
 
 %build
 dune_release_pkgs='jsonm'
+mv opam ${dune_release_pkgs}.opam
 %ocaml_dune_setup
 %ocaml_dune_build
 
diff --git a/_service b/_service
index 6a3c682..f67c768 100644
--- a/_service
+++ b/_service
@@ -1,10 +1,13 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="url">https://github.com/dune-universe/jsonm.git</param>
-    <param name="scm">git</param>
-    <param name="versionformat">1.0.1</param>
-    <param name="revision">duniverse-v1.0.1</param>
     <param name="filename">ocaml-jsonm</param>
+    <param name="revision">15ba785854b8b6e45958570d23238b603cd3f8d6</param>
+    <param name="scm">git</param>
+    <param name="submodules">disable</param>
+    <param name="url">https://github.com/dbuenzli/jsonm.git</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="versionrewrite-pattern">[v]?([^\+]+)(.*)</param>
+    <param name="versionrewrite-replacement">\1</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">*.tar</param>
diff --git a/ocaml-jsonm-1.0.1.tar.xz b/ocaml-jsonm-1.0.1.tar.xz
index 5f72fa1..7f20f42 100644
--- a/ocaml-jsonm-1.0.1.tar.xz
+++ b/ocaml-jsonm-1.0.1.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:958c7b601e77886cd486ddf4b86e150753e3c57e543f7bf3b2b4c4246de2db03
-size 20604
+oid sha256:902f2bc243fb9861cbdda1d597a4e7c2fed90339c9fa66d6327addd1992a86d7
+size 20476
diff --git a/ocaml-jsonm.patch b/ocaml-jsonm.patch
new file mode 100644
index 0000000..0d292ac
--- /dev/null
+++ b/ocaml-jsonm.patch
@@ -0,0 +1,14 @@
+--- /dev/null
++++ b/dune-project
+@@ -0,0 +1,2 @@
++(lang dune 1.0)
++(name jsonm)
+--- /dev/null
++++ b/src/dune
+@@ -0,0 +1,6 @@
++(library
++ (name jsonm)
++ (public_name jsonm)
++ (libraries uutf)
++ (flags :standard -w -6-27-32-39)
++ (wrapped false))