rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 173021 from home:coolo:branches:openSUSE:Factory

Browse Source 
- 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
This commit is contained in:
Frederic Crozat 2013-04-23 12:55:16 +00:00 committed by Git OBS Bridge
parent 85d08e28ed
commit 16bae67520
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
systemd-mini.changes
View File

@ -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 Mon Apr 22 09:48:22 UTC 2013 - fcrozat@suse.com

7
systemd-mini.spec
View File

@ -81,6 +81,7 @@ BuildRequires: pkgconfig(usbutils) >= 0.82
%if 0%{?bootstrap} %if 0%{?bootstrap}
Requires: this-is-only-for-build-envs Requires: this-is-only-for-build-envs
Conflicts: systemd Conflicts: systemd
Conflicts: kiwi
%else %else
# the buildignore is important for bootstrapping # the buildignore is important for bootstrapping
#!BuildIgnore: udev #!BuildIgnore: udev
@ -205,6 +206,9 @@ Summary: Development headers for systemd
License: LGPL-2.1+ License: LGPL-2.1+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name} = %{version} Requires: %{name} = %{version}
%if 0%{?bootstrap}
Conflicts: systemd-devel
%endif
%description devel %description devel
Development headers and auxiliary files for developing applications for systemd. Development headers and auxiliary files for developing applications for systemd.
@ -237,7 +241,7 @@ Conflicts: ConsoleKit < 0.4.1
Requires: filesystem Requires: filesystem
%if 0%{?bootstrap} %if 0%{?bootstrap}
Provides: udev = %{version} Provides: udev = %{version}
Conflicts: libudev%{udev_major} = %{version} Conflicts: libudev%{udev_major}
Conflicts: udev Conflicts: udev
%endif %endif
@ -257,6 +261,7 @@ Group: System/Libraries
Requires: %{udevpkgname} >= %{version}-%{release} Requires: %{udevpkgname} >= %{version}-%{release}
%if 0%{?bootstrap} %if 0%{?bootstrap}
Conflicts: libudev%{udev_major} Conflicts: libudev%{udev_major}
Conflicts: kiwi
%endif %endif
%description -n lib%{udevpkgname}%{udev_major} %description -n lib%{udevpkgname}%{udev_major}

5
systemd.changes
View File

@ -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 Mon Apr 22 09:48:22 UTC 2013 - fcrozat@suse.com

7
systemd.spec
View File

@ -76,6 +76,7 @@ BuildRequires: pkgconfig(usbutils) >= 0.82
%if 0%{?bootstrap} %if 0%{?bootstrap}
Requires: this-is-only-for-build-envs Requires: this-is-only-for-build-envs
Conflicts: systemd Conflicts: systemd
Conflicts: kiwi
%else %else
# the buildignore is important for bootstrapping # the buildignore is important for bootstrapping
#!BuildIgnore: udev #!BuildIgnore: udev
@ -200,6 +201,9 @@ Summary: Development headers for systemd
License: LGPL-2.1+ License: LGPL-2.1+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name} = %{version} Requires: %{name} = %{version}
%if 0%{?bootstrap}
Conflicts: systemd-devel
%endif
%description devel %description devel
Development headers and auxiliary files for developing applications for systemd. Development headers and auxiliary files for developing applications for systemd.
@ -232,7 +236,7 @@ Conflicts: ConsoleKit < 0.4.1
Requires: filesystem Requires: filesystem
%if 0%{?bootstrap} %if 0%{?bootstrap}
Provides: udev = %{version} Provides: udev = %{version}
Conflicts: libudev%{udev_major} = %{version} Conflicts: libudev%{udev_major}
Conflicts: udev Conflicts: udev
%endif %endif
@ -252,6 +256,7 @@ Group: System/Libraries
Requires: %{udevpkgname} >= %{version}-%{release} Requires: %{udevpkgname} >= %{version}-%{release}
%if 0%{?bootstrap} %if 0%{?bootstrap}
Conflicts: libudev%{udev_major} Conflicts: libudev%{udev_major}
Conflicts: kiwi
%endif %endif
%description -n lib%{udevpkgname}%{udev_major} %description -n lib%{udevpkgname}%{udev_major}