From be6e0cfdb03cd4ff340b5eeca8b93e5f0a4a5b44f5d3953d4f3677339e6b9711 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 2 Sep 2020 08:56:32 +0000 Subject: [PATCH 1/2] - Mention that it's a service in the summary OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-kiwi_metainfo_helper?expand=0&rev=14 --- obs-service-kiwi_metainfo_helper.changes | 10 ++++++++-- obs-service-kiwi_metainfo_helper.spec | 11 +++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/obs-service-kiwi_metainfo_helper.changes b/obs-service-kiwi_metainfo_helper.changes index f15138b..5f06733 100644 --- a/obs-service-kiwi_metainfo_helper.changes +++ b/obs-service-kiwi_metainfo_helper.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Thu Aug 27 07:12:48 UTC 2020 - Fabian Vogt @@ -7,7 +13,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 +24,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..1caff70 100644 --- a/obs-service-kiwi_metainfo_helper.spec +++ b/obs-service-kiwi_metainfo_helper.spec @@ -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 From 22e3d1aaec63449490ec8adc1ace7568f2745036cd0c91a1da90af5b4a502dde Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 2 Sep 2020 12:57:07 +0000 Subject: [PATCH 2/2] - Bump version to 0.1 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-kiwi_metainfo_helper?expand=0&rev=15 --- obs-service-kiwi_metainfo_helper.changes | 1 + obs-service-kiwi_metainfo_helper.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/obs-service-kiwi_metainfo_helper.changes b/obs-service-kiwi_metainfo_helper.changes index 5f06733..820930d 100644 --- a/obs-service-kiwi_metainfo_helper.changes +++ b/obs-service-kiwi_metainfo_helper.changes @@ -3,6 +3,7 @@ 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 diff --git a/obs-service-kiwi_metainfo_helper.spec b/obs-service-kiwi_metainfo_helper.spec index 1caff70..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