diff --git a/obs-service-kiwi_metainfo_helper.changes b/obs-service-kiwi_metainfo_helper.changes index f15138b..820930d 100644 --- a/obs-service-kiwi_metainfo_helper.changes +++ b/obs-service-kiwi_metainfo_helper.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 1 08:42:45 UTC 2020 - Fabian Vogt + +- Use a boolean dep to avoid use of %{is_opensuse}. The prjconf + selects which one to use this way. +- Bump version to 0.1 + ------------------------------------------------------------------- Thu Aug 27 07:12:48 UTC 2020 - Fabian Vogt @@ -7,7 +14,7 @@ Thu Aug 27 07:12:48 UTC 2020 - Fabian Vogt ------------------------------------------------------------------- Tue Aug 25 11:10:50 UTC 2020 - Stefan Nica -- Also allow working on Chart.yaml +- Also allow working on Chart.yaml (jsc#CAPS-5) ------------------------------------------------------------------- Tue Jul 7 13:53:33 UTC 2020 - Fabian Vogt @@ -18,7 +25,7 @@ Tue Jul 7 13:53:33 UTC 2020 - Fabian Vogt ------------------------------------------------------------------- Tue May 5 09:19:56 UTC 2020 - Fabian Vogt -- Also allow working on Dockerfile +- Also allow working on Dockerfile (jsc#CAPS-10) ------------------------------------------------------------------- Mon May 4 13:40:20 UTC 2020 - Fabian Vogt diff --git a/obs-service-kiwi_metainfo_helper.spec b/obs-service-kiwi_metainfo_helper.spec index b2317d7..cbc0589 100644 --- a/obs-service-kiwi_metainfo_helper.spec +++ b/obs-service-kiwi_metainfo_helper.spec @@ -17,7 +17,7 @@ Name: obs-service-kiwi_metainfo_helper -Version: 0.0 +Version: 0.1 Release: 0 Summary: Service for substituting various variables in build recipes License: GPL-2.0-or-later @@ -27,12 +27,11 @@ Source0: kiwi_metainfo_helper.service Source1: kiwi_metainfo_helper Source2: README Requires: sed -# For os-release -%if 0%{?is_opensuse} -Requires: openSUSE-release -%else -Requires: sles-release -%endif +# Technically, this should read os-release inside the built image, but doing +# that is much more complex. As obsrepositories:// has to be used anyway, +# using the system's os-release is fine for now. +Requires: (sles-release or openSUSE-release) +Conflicts: dummy-release BuildArch: noarch %description