From 1d570af07bda014f6c81f69cd0d2dddd6052bd03cbc1e8f7cfcd4284dd0864f4 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Tue, 23 Apr 2013 12:55:16 +0000 Subject: [PATCH] Accepting request 173021 from home:coolo:branches:openSUSE:Factory - add some more conflicts to make bootstrap work OBS-URL: https://build.opensuse.org/request/show/173021 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=369 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 7 ++++++- systemd.changes | 5 +++++ systemd.spec | 7 ++++++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 6de94b11..484dff47 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 23 12:44:16 UTC 2013 - coolo@suse.com + +- add some more conflicts to make bootstrap work + ------------------------------------------------------------------- Mon Apr 22 09:48:22 UTC 2013 - fcrozat@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 30827d23..6fc0dd54 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -81,6 +81,7 @@ BuildRequires: pkgconfig(usbutils) >= 0.82 %if 0%{?bootstrap} Requires: this-is-only-for-build-envs Conflicts: systemd +Conflicts: kiwi %else # the buildignore is important for bootstrapping #!BuildIgnore: udev @@ -205,6 +206,9 @@ Summary: Development headers for systemd License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +%if 0%{?bootstrap} +Conflicts: systemd-devel +%endif %description devel Development headers and auxiliary files for developing applications for systemd. @@ -237,7 +241,7 @@ Conflicts: ConsoleKit < 0.4.1 Requires: filesystem %if 0%{?bootstrap} Provides: udev = %{version} -Conflicts: libudev%{udev_major} = %{version} +Conflicts: libudev%{udev_major} Conflicts: udev %endif @@ -257,6 +261,7 @@ Group: System/Libraries Requires: %{udevpkgname} >= %{version}-%{release} %if 0%{?bootstrap} Conflicts: libudev%{udev_major} +Conflicts: kiwi %endif %description -n lib%{udevpkgname}%{udev_major} diff --git a/systemd.changes b/systemd.changes index 6de94b11..484dff47 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 23 12:44:16 UTC 2013 - coolo@suse.com + +- add some more conflicts to make bootstrap work + ------------------------------------------------------------------- Mon Apr 22 09:48:22 UTC 2013 - fcrozat@suse.com diff --git a/systemd.spec b/systemd.spec index 298a3c97..688a9da6 100644 --- a/systemd.spec +++ b/systemd.spec @@ -76,6 +76,7 @@ BuildRequires: pkgconfig(usbutils) >= 0.82 %if 0%{?bootstrap} Requires: this-is-only-for-build-envs Conflicts: systemd +Conflicts: kiwi %else # the buildignore is important for bootstrapping #!BuildIgnore: udev @@ -200,6 +201,9 @@ Summary: Development headers for systemd License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +%if 0%{?bootstrap} +Conflicts: systemd-devel +%endif %description devel Development headers and auxiliary files for developing applications for systemd. @@ -232,7 +236,7 @@ Conflicts: ConsoleKit < 0.4.1 Requires: filesystem %if 0%{?bootstrap} Provides: udev = %{version} -Conflicts: libudev%{udev_major} = %{version} +Conflicts: libudev%{udev_major} Conflicts: udev %endif @@ -252,6 +256,7 @@ Group: System/Libraries Requires: %{udevpkgname} >= %{version}-%{release} %if 0%{?bootstrap} Conflicts: libudev%{udev_major} +Conflicts: kiwi %endif %description -n lib%{udevpkgname}%{udev_major}