From 0cfa634a7d7ecde24c9d9ecaad93454df9ebdaf326f3cdde395706e3e920ef15 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 3 Sep 2021 09:42:29 +0000 Subject: [PATCH] - Make sure the versions of both udev and systemd packages are always the same (bsc#1189480) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1182 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 7 ++++--- systemd.changes | 5 +++++ systemd.spec | 7 ++++--- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 3750243d..31d40b4f 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 3 09:38:23 UTC 2021 - Franck Bui + +- Make sure the versions of both udev and systemd packages are always the same (bsc#1189480) + ------------------------------------------------------------------- Thu Sep 2 10:01:23 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index d5885951..d47a5968 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -276,13 +276,14 @@ This library provides several of the systemd C APIs: Summary: A rule-based device node and kernel event manager License: GPL-2.0-only URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +Requires: %{name} = %{version}-%{release} +%systemd_requires Requires: kmod Requires: system-group-hardware Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun): coreutils -%systemd_requires Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 @@ -368,12 +369,12 @@ and systemd-importd. Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} +%systemd_requires # This Recommends because some symbols of libidn2 are dlopen()ed by resolved Recommends: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved -%systemd_requires %description network Systemd tools to manage network settings using networkd and @@ -566,6 +567,7 @@ testsuite, please refer to %{_testsuitedir}/test/README.testsuite. Summary: Experimental systemd features License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} +%systemd_requires # These Recommends because some symbols of these libs are dlopen()ed by home stuff Recommends: libfido2 Recommends: libpwquality1 @@ -577,7 +579,6 @@ BuildRequires: pkgconfig(pwquality) # fdisk and openssl are build requirements for home stuff and repart BuildRequires: pkgconfig(fdisk) BuildRequires: pkgconfig(openssl) -%systemd_requires %description experimental This package contains optional extra services that are considered as diff --git a/systemd.changes b/systemd.changes index 3750243d..31d40b4f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 3 09:38:23 UTC 2021 - Franck Bui + +- Make sure the versions of both udev and systemd packages are always the same (bsc#1189480) + ------------------------------------------------------------------- Thu Sep 2 10:01:23 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 84d5efc2..70619c3b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -274,13 +274,14 @@ This library provides several of the systemd C APIs: Summary: A rule-based device node and kernel event manager License: GPL-2.0-only URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +Requires: %{name} = %{version}-%{release} +%systemd_requires Requires: kmod Requires: system-group-hardware Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun): coreutils -%systemd_requires Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 @@ -366,12 +367,12 @@ and systemd-importd. Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} +%systemd_requires # This Recommends because some symbols of libidn2 are dlopen()ed by resolved Recommends: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved -%systemd_requires %description network Systemd tools to manage network settings using networkd and @@ -564,6 +565,7 @@ testsuite, please refer to %{_testsuitedir}/test/README.testsuite. Summary: Experimental systemd features License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} +%systemd_requires # These Recommends because some symbols of these libs are dlopen()ed by home stuff Recommends: libfido2 Recommends: libpwquality1 @@ -575,7 +577,6 @@ BuildRequires: pkgconfig(pwquality) # fdisk and openssl are build requirements for home stuff and repart BuildRequires: pkgconfig(fdisk) BuildRequires: pkgconfig(openssl) -%systemd_requires %description experimental This package contains optional extra services that are considered as