From 4143f172789fb1d354214ab62545cfc82d63cd79d1b45ab3b52c555daa2631e5 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Wed, 13 Nov 2019 12:28:33 +0000
Subject: [PATCH] - Update to version 5.1.20, via _service file   No changelog
 provided by upstream

OBS-URL: https://build.opensuse.org/package/show/Virtualization/supermin?expand=0&rev=45
---
 _service               | 14 ++++++++++++++
 supermin-5.1.18.tar.xz |  3 ---
 supermin-5.1.20.tar.xz |  3 +++
 supermin.changes       |  6 ++++++
 supermin.spec          |  6 ++----
 suse_release.patch     | 24 +++++++++---------------
 6 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 _service
 delete mode 100644 supermin-5.1.18.tar.xz
 create mode 100644 supermin-5.1.20.tar.xz

diff --git a/_service b/_service
new file mode 100644
index 0000000..a7def03
--- /dev/null
+++ b/_service
@@ -0,0 +1,14 @@
+<services>
+  <service name="tar_scm" mode="disabled">
+    <param name="url">https://github.com/libguestfs/supermin.git</param>
+    <param name="scm">git</param>
+    <param name="versionformat">5.1.20</param>
+    <param name="revision">v5.1.20</param>
+    <param name="filename">supermin</param>
+  </service>
+  <service name="recompress" mode="disabled">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service name="set_version" mode="disabled"/>
+</services>
diff --git a/supermin-5.1.18.tar.xz b/supermin-5.1.18.tar.xz
deleted file mode 100644
index d84350f..0000000
--- a/supermin-5.1.18.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:792c9c6d51ff4740f94ebdc4ad0a0c20726e32dcdbdbcf81fbb15c75eaf6df9a
-size 363536
diff --git a/supermin-5.1.20.tar.xz b/supermin-5.1.20.tar.xz
new file mode 100644
index 0000000..9f4e948
--- /dev/null
+++ b/supermin-5.1.20.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d71d38544923c0f88ab45385c4b6ad9a9ae5aa3bc3d9ca623877521d7a598b7a
+size 362080
diff --git a/supermin.changes b/supermin.changes
index 6aa96a6..3e5efc6 100644
--- a/supermin.changes
+++ b/supermin.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov  1 12:34:56 UTC 2019 - ohering@suse.de
+
+- Update to version 5.1.20, via _service file
+  No changelog provided by upstream
+
 -------------------------------------------------------------------
 Wed Jul 31 16:52:14 UTC 2019 - Larry Dewey <ldewey@suse.com>
 
diff --git a/supermin.spec b/supermin.spec
index 44d1494..d63aba7 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -17,9 +17,9 @@
 
 
 Name:           supermin
-Version:        5.1.18
+Version:        5.1.20
 Release:        0
-%{ocaml_preserve_bytecode}
+%{?ocaml_preserve_bytecode}
 Url:            http://libguestfs.org/
 Summary:        Bootstrapping tool for creating supermin appliances
 License:        GPL-3.0-or-later
@@ -30,7 +30,6 @@ Requires:       sysconfig-netconfig
 Requires:       tar
 Requires:       xmlstarlet
 Requires:       zypper
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        supermin-%{version}.tar.xz
 # Pending upstream review
 Patch0:         suse_release.patch
@@ -80,7 +79,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -ls
 
 %files
-%defattr (-,root,root)
 %doc README
 %doc TODO
 /usr/bin/*
diff --git a/suse_release.patch b/suse_release.patch
index 07c6c06..194eb11 100644
--- a/suse_release.patch
+++ b/suse_release.patch
@@ -1,7 +1,5 @@
-Index: supermin-5.1.18/src/os_release.ml
-===================================================================
---- supermin-5.1.18.orig/src/os_release.ml
-+++ supermin-5.1.18/src/os_release.ml
+--- a/src/os_release.ml
++++ b/src/os_release.ml
 @@ -29,6 +29,7 @@ let split sep str =
  
  type os_release = {
@@ -40,10 +38,8 @@ Index: supermin-5.1.18/src/os_release.ml
 +  match get_data () with
 +  | None -> []
 +  | Some d -> d.id_like
-Index: supermin-5.1.18/src/os_release.mli
-===================================================================
---- supermin-5.1.18.orig/src/os_release.mli
-+++ supermin-5.1.18/src/os_release.mli
+--- a/src/os_release.mli
++++ b/src/os_release.mli
 @@ -24,3 +24,10 @@ val get_id : unit -> string
  
      An empty string is returned if the file does not exist or cannot
@@ -55,14 +51,12 @@ Index: supermin-5.1.18/src/os_release.mli
 +
 +    An empty list is returned if the file does not exist, cannot
 +    be read or the ID_LIKE field is not defined. *)
-Index: supermin-5.1.18/src/ph_rpm.ml
-===================================================================
---- supermin-5.1.18.orig/src/ph_rpm.ml
-+++ supermin-5.1.18/src/ph_rpm.ml
-@@ -41,6 +41,7 @@ let opensuse_detect () =
-   Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () &&
+--- a/src/ph_rpm.ml
++++ b/src/ph_rpm.ml
+@@ -42,6 +42,7 @@ let opensuse_detect () =
      Config.zypper <> "no" &&
-     (List.mem (Os_release.get_id ()) [ "opensuse"; "sled"; "sles" ] ||
+     (List.mem (Os_release.get_id ()) [ "sled"; "sles" ] ||
+      string_prefix "opensuse" (Os_release.get_id ()) ||
 +     List.mem "suse" (Os_release.get_id_like ()) ||
       try (stat "/etc/SuSE-release").st_kind = S_REG with Unix_error _ -> false)