From d7441c19625697366cbdd1331e8ba79af3b7379c9b4308a9fc861ff98b28bc05 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 11 Feb 2014 10:26:19 +0000 Subject: [PATCH] - add more requires to this-is-only-for-build-envs to avoid problems in kiwi configs OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=514 --- systemd-mini.changes | 6 ++++++ systemd-mini.spec | 4 ++++ systemd.changes | 6 ++++++ systemd.spec | 4 ++++ 4 files changed, 20 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index b743cd69..7a7a4d7c 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 11 10:25:26 UTC 2014 - coolo@suse.com + +- add more requires to this-is-only-for-build-envs to avoid + problems in kiwi configs + ------------------------------------------------------------------- Mon Feb 10 15:15:35 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index a77729c4..b304c603 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -378,6 +378,8 @@ Requires: filesystem Provides: udev = %{version} Conflicts: libudev%{udev_major} Conflicts: udev +# avoid kiwi picking it for bootstrap +Requires: this-is-only-for-build-envs %endif %description -n %{udevpkgname} @@ -397,6 +399,8 @@ Requires: %{udevpkgname} >= %{version}-%{release} %if 0%{?bootstrap} Conflicts: libudev%{udev_major} Conflicts: kiwi +# avoid kiwi picking it for bootstrap +Requires: this-is-only-for-build-envs %endif %description -n lib%{udevpkgname}%{udev_major} diff --git a/systemd.changes b/systemd.changes index b743cd69..7a7a4d7c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 11 10:25:26 UTC 2014 - coolo@suse.com + +- add more requires to this-is-only-for-build-envs to avoid + problems in kiwi configs + ------------------------------------------------------------------- Mon Feb 10 15:15:35 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 89d5f31d..34680761 100644 --- a/systemd.spec +++ b/systemd.spec @@ -373,6 +373,8 @@ Requires: filesystem Provides: udev = %{version} Conflicts: libudev%{udev_major} Conflicts: udev +# avoid kiwi picking it for bootstrap +Requires: this-is-only-for-build-envs %endif %description -n %{udevpkgname} @@ -392,6 +394,8 @@ Requires: %{udevpkgname} >= %{version}-%{release} %if 0%{?bootstrap} Conflicts: libudev%{udev_major} Conflicts: kiwi +# avoid kiwi picking it for bootstrap +Requires: this-is-only-for-build-envs %endif %description -n lib%{udevpkgname}%{udev_major}