Hello community, here is the log from the commit of package supermin for openSUSE:Factory checked in at 2017-09-04 12:34:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/supermin (Old) and /work/SRC/openSUSE:Factory/.supermin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "supermin" Mon Sep 4 12:34:25 2017 rev:4 rq:520161 version:5.1.18 Changes: -------- --- /work/SRC/openSUSE:Factory/supermin/supermin.changes 2017-08-24 18:38:17.868576253 +0200 +++ /work/SRC/openSUSE:Factory/.supermin.new/supermin.changes 2017-09-04 12:34:41.189315233 +0200 @@ -1,0 +2,6 @@ +Thu Aug 31 14:09:58 UTC 2017 - [email protected] + +- Distro detection: also use ID_LIKE to catch suse distros + add patch: suse_release.patch + +------------------------------------------------------------------- New: ---- suse_release.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ supermin.spec ++++++ --- /var/tmp/diff_new_pack.324pa8/_old 2017-09-04 12:34:42.377148219 +0200 +++ /var/tmp/diff_new_pack.324pa8/_new 2017-09-04 12:34:42.397145407 +0200 @@ -30,6 +30,8 @@ Requires: zypper BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: supermin-%{version}.tar.xz +# Pending upstream review +Patch0: suse_release.patch %if "%{?_ignore_exclusive_arch}" == "" ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64 %endif @@ -59,6 +61,7 @@ %prep %setup -q +%patch0 -p1 %build export ZYPPER=zypper ++++++ suse_release.patch ++++++ 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 @@ -29,6 +29,7 @@ let split sep str = type os_release = { id : string; + id_like : string list; } let data = ref None @@ -52,6 +53,7 @@ and parse () = let lines = List.filter (fun s -> s.[0] <> '#') lines in let id = ref "" in + let id_like = ref [] in List.iter ( fun line -> @@ -65,10 +67,11 @@ and parse () = else value in match field with | "ID" -> id := value + | "ID_LIKE" -> id_like := string_split " " value | _ -> () ) lines; - Some { id = !id; } + Some { id = !id; id_like = !id_like } ) else None @@ -76,3 +79,8 @@ let get_id () = match get_data () with | None -> "" | Some d -> d.id + +let get_id_like () = + 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 @@ -24,3 +24,10 @@ val get_id : unit -> string An empty string is returned if the file does not exist or cannot be read. *) + +val get_id_like : unit -> string list +(** Get the value of the "ID_LIKE" field from the /etc/os-release file + on the current system. + + 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 () && Config.zypper <> "no" && (List.mem (Os_release.get_id ()) [ "opensuse"; "sled"; "sles" ] || + List.mem "suse" (Os_release.get_id_like ()) || try (stat "/etc/SuSE-release").st_kind = S_REG with Unix_error _ -> false) let mageia_detect () =
