From 6ad906085c6766378e5a02b196fd2aba47961ff8 Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Tue, 18 Jul 2023 08:41:58 +0200 Subject: [PATCH] osbuild-dev: include in fedora package --- osbuild.spec | 11 +++++++++++ setup.py | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/osbuild.spec b/osbuild.spec index a695e784..b5254eb6 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -116,6 +116,13 @@ Summary: Extra tools and utilities Requires: %{name} = %{version}-%{release} Requires: python3-pyyaml +# These are required for `osbuild-dev`, only packaged for Fedora +%if 0%{?fedora} +Requires: python3-rich +Requires: python3-attrs +Requires: python3-typer +%endif + %description tools Contains additional tools and utilities for development of manifests and osbuild. @@ -181,6 +188,9 @@ install -D -p -m 0644 selinux/osbuild.if %{buildroot}%{_datadir}/selinux/devel/i mkdir -p %{buildroot}%{_udevrulesdir} install -p -m 0755 data/10-osbuild-inhibitor.rules %{buildroot}%{_udevrulesdir} +# Remove `osbuild-dev` on non-fedora systems +%{!?fedora:rm %{buildroot}%{_bindir}/osbuild-dev} + %check exit 0 # We have some integration tests, but those require running a VM, so that would @@ -249,6 +259,7 @@ fi %files tools %{_bindir}/osbuild-mpp +%{?fedora:%{_bindir}/osbuild-dev} %changelog diff --git a/setup.py b/setup.py index a78e58d2..93241b68 100644 --- a/setup.py +++ b/setup.py @@ -15,6 +15,7 @@ setuptools.setup( ] }, scripts=[ - "tools/osbuild-mpp" + "tools/osbuild-mpp", + "tools/osbuild-dev" ], )