From 8c52c174707b1ddc3e23a8229f168d8efc1b1ab1869e38dce88cadd89f0b9043 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 10 Dec 2012 14:22:55 +0000 Subject: [PATCH] - add conflicts between udev-mini and udev-mini-devel to libudev1 - add conflicts between udev-mini and udev-mini-devel to libudev1 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=320 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 2 ++ systemd.changes | 5 +++++ systemd.spec | 2 ++ 4 files changed, 14 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index 1b6d3a2..036dd8c 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 10 14:22:21 UTC 2012 - coolo@suse.com + +- add conflicts between udev-mini and udev-mini-devel to libudev1 + ------------------------------------------------------------------- Thu Dec 6 22:47:09 UTC 2012 - crrodriguez@opensuse.org diff --git a/systemd-mini.spec b/systemd-mini.spec index c403329..810469b 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -239,6 +239,7 @@ Conflicts: ConsoleKit < 0.4.1 Requires: filesystem %if 0%{?bootstrap} Provides: udev = %{version} +Conflicts: libudev%{udev_major} = %{version} %endif %description -n %{udevpkgname} @@ -270,6 +271,7 @@ Group: Development/Libraries/Other Requires: lib%{udevpkgname}%{udev_major} = %{version}-%{release} %if 0%{?bootstrap} Provides: libudev-devel = %{version} +Conflicts: libudev%{udev_major} = %{version} %endif %description -n lib%{udevpkgname}-devel diff --git a/systemd.changes b/systemd.changes index 1b6d3a2..036dd8c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 10 14:22:21 UTC 2012 - coolo@suse.com + +- add conflicts between udev-mini and udev-mini-devel to libudev1 + ------------------------------------------------------------------- Thu Dec 6 22:47:09 UTC 2012 - crrodriguez@opensuse.org diff --git a/systemd.spec b/systemd.spec index 8cf0b45..4ab279c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -234,6 +234,7 @@ Conflicts: ConsoleKit < 0.4.1 Requires: filesystem %if 0%{?bootstrap} Provides: udev = %{version} +Conflicts: libudev%{udev_major} = %{version} %endif %description -n %{udevpkgname} @@ -265,6 +266,7 @@ Group: Development/Libraries/Other Requires: lib%{udevpkgname}%{udev_major} = %{version}-%{release} %if 0%{?bootstrap} Provides: libudev-devel = %{version} +Conflicts: libudev%{udev_major} = %{version} %endif %description -n lib%{udevpkgname}-devel