SHA256
1
0
forked from pool/supermin

- 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
This commit is contained in:
Olaf Hering 2019-11-13 12:28:33 +00:00 committed by Git OBS Bridge
parent 200d140da0
commit 4143f17278
6 changed files with 34 additions and 22 deletions

14
_service Normal file
View File

@ -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>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:792c9c6d51ff4740f94ebdc4ad0a0c20726e32dcdbdbcf81fbb15c75eaf6df9a
size 363536

3
supermin-5.1.20.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d71d38544923c0f88ab45385c4b6ad9a9ae5aa3bc3d9ca623877521d7a598b7a
size 362080

View File

@ -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> Wed Jul 31 16:52:14 UTC 2019 - Larry Dewey <ldewey@suse.com>

View File

@ -17,9 +17,9 @@
Name: supermin Name: supermin
Version: 5.1.18 Version: 5.1.20
Release: 0 Release: 0
%{ocaml_preserve_bytecode} %{?ocaml_preserve_bytecode}
Url: http://libguestfs.org/ Url: http://libguestfs.org/
Summary: Bootstrapping tool for creating supermin appliances Summary: Bootstrapping tool for creating supermin appliances
License: GPL-3.0-or-later License: GPL-3.0-or-later
@ -30,7 +30,6 @@ Requires: sysconfig-netconfig
Requires: tar Requires: tar
Requires: xmlstarlet Requires: xmlstarlet
Requires: zypper Requires: zypper
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: supermin-%{version}.tar.xz Source0: supermin-%{version}.tar.xz
# Pending upstream review # Pending upstream review
Patch0: suse_release.patch Patch0: suse_release.patch
@ -80,7 +79,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -ls find $RPM_BUILD_ROOT -ls
%files %files
%defattr (-,root,root)
%doc README %doc README
%doc TODO %doc TODO
/usr/bin/* /usr/bin/*

View File

@ -1,7 +1,5 @@
Index: supermin-5.1.18/src/os_release.ml --- a/src/os_release.ml
=================================================================== +++ b/src/os_release.ml
--- supermin-5.1.18.orig/src/os_release.ml
+++ supermin-5.1.18/src/os_release.ml
@@ -29,6 +29,7 @@ let split sep str = @@ -29,6 +29,7 @@ let split sep str =
type os_release = { type os_release = {
@ -40,10 +38,8 @@ Index: supermin-5.1.18/src/os_release.ml
+ match get_data () with + match get_data () with
+ | None -> [] + | None -> []
+ | Some d -> d.id_like + | Some d -> d.id_like
Index: supermin-5.1.18/src/os_release.mli --- a/src/os_release.mli
=================================================================== +++ b/src/os_release.mli
--- supermin-5.1.18.orig/src/os_release.mli
+++ supermin-5.1.18/src/os_release.mli
@@ -24,3 +24,10 @@ val get_id : unit -> string @@ -24,3 +24,10 @@ val get_id : unit -> string
An empty string is returned if the file does not exist or cannot 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 + An empty list is returned if the file does not exist, cannot
+ be read or the ID_LIKE field is not defined. *) + be read or the ID_LIKE field is not defined. *)
Index: supermin-5.1.18/src/ph_rpm.ml --- a/src/ph_rpm.ml
=================================================================== +++ b/src/ph_rpm.ml
--- supermin-5.1.18.orig/src/ph_rpm.ml @@ -42,6 +42,7 @@ let opensuse_detect () =
+++ supermin-5.1.18/src/ph_rpm.ml
@@ -41,6 +41,7 @@ let opensuse_detect () =
Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () &&
Config.zypper <> "no" && 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 ()) || + List.mem "suse" (Os_release.get_id_like ()) ||
try (stat "/etc/SuSE-release").st_kind = S_REG with Unix_error _ -> false) try (stat "/etc/SuSE-release").st_kind = S_REG with Unix_error _ -> false)