- 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
This commit is contained in:
Stephan Kulow 2014-02-11 10:26:19 +00:00 committed by Git OBS Bridge
parent 21eb780b02
commit d7441c1962
4 changed files with 20 additions and 0 deletions

View File

@ -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

View File

@ -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}

View File

@ -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

View File

@ -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}