From 4f587b0b7f9ff452195bd8d889bed123e70a8b4e Mon Sep 17 00:00:00 2001
From: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Date: Mon, 22 Jul 2024 16:39:25 +0100
Subject: [PATCH] opam: dunify message-switch-unix's metadata

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
---
 dune-project                      | 10 ++++++
 message-switch-unix.opam          | 51 +++++++++++++++++--------------
 message-switch-unix.opam.template | 27 ----------------
 3 files changed, 38 insertions(+), 50 deletions(-)
 delete mode 100644 message-switch-unix.opam.template

diff --git a/dune-project b/dune-project
index fde96410f19..481ea148048 100644
--- a/dune-project
+++ b/dune-project
@@ -464,6 +464,16 @@ This package provides an Lwt compatible interface to the library.")
 
 (package
   (name message-switch-unix)
+  (synopsis "A simple store-and-forward message switch")
+  (description "The switch stores messages in queues with well-known names. Clients use a simple HTTP protocol to enqueue and dequeue messages.")
+  (depends
+    base-threads
+    cohttp
+    (message-switch-core (= :version))
+    ppx_deriving_rpc
+    rpclib
+    (xapi-stdext-threads (= :version))
+  )
 )
 
 (package
diff --git a/message-switch-unix.opam b/message-switch-unix.opam
index 67b0bd817e3..cd086195cb2 100644
--- a/message-switch-unix.opam
+++ b/message-switch-unix.opam
@@ -1,30 +1,35 @@
 # This file is generated by dune, edit dune-project instead
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
-name: "message-switch-unix"
-maintainer: "xen-api@lists.xen.org"
-authors: [ "xen-api@lists.xen.org" ]
-homepage: "https://github.com/xapi-project/xen-api"
+synopsis: "A simple store-and-forward message switch"
+description:
+  "The switch stores messages in queues with well-known names. Clients use a simple HTTP protocol to enqueue and dequeue messages."
+maintainer: ["Xapi project maintainers"]
+authors: ["xen-api@lists.xen.org"]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
-tags: [ "org:xapi-project" ]
-build: [
-  ["./configure" "--prefix" "%{prefix}%"]
-  [ "dune" "build" "-p" name "-j" jobs ]
-]
 depends: [
-  "ocaml"
-  "dune" {build & >= "1.4"}
-  "odoc" {with-doc}
+  "dune" {>= "3.0"}
   "base-threads"
-  "message-switch-core"
+  "cohttp"
+  "message-switch-core" {= version}
   "ppx_deriving_rpc"
-  "xapi-stdext-unix"
+  "rpclib"
+  "xapi-stdext-threads" {= version}
+  "odoc" {with-doc}
 ]
-synopsis: "A simple store-and-forward message switch"
-description: """
-The switch stores messages in queues with well-known names. Clients use
-a simple HTTP protocol to enqueue and dequeue messages."""
-url {
-  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
-}
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/xapi-project/xen-api.git"
diff --git a/message-switch-unix.opam.template b/message-switch-unix.opam.template
deleted file mode 100644
index f21bd6e1883..00000000000
--- a/message-switch-unix.opam.template
+++ /dev/null
@@ -1,27 +0,0 @@
-opam-version: "2.0"
-name: "message-switch-unix"
-maintainer: "xen-api@lists.xen.org"
-authors: [ "xen-api@lists.xen.org" ]
-homepage: "https://github.com/xapi-project/xen-api"
-bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
-tags: [ "org:xapi-project" ]
-build: [
-  ["./configure" "--prefix" "%{prefix}%"]
-  [ "dune" "build" "-p" name "-j" jobs ]
-]
-depends: [
-  "ocaml"
-  "dune" {build & >= "1.4"}
-  "odoc" {with-doc}
-  "base-threads"
-  "message-switch-core"
-  "ppx_deriving_rpc"
-]
-synopsis: "A simple store-and-forward message switch"
-description: """
-The switch stores messages in queues with well-known names. Clients use
-a simple HTTP protocol to enqueue and dequeue messages."""
-url {
-  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
-}