[PATCH] packaging: remove the explicit requires on kmod-libs

[Yauheni Kaliuta]

The main kmod package requires kmod-libs, via the "Requires:
%{name}-libs%{?_isa} = %{version}-%{release}" line in
kmod.spec. This is not actually necessary: /bin/kmod statically
links to libkmod (which is all that's in kmod-libs), and besides,
if it was dynamically linked rpm would generate the dependency
automatically.

kmod-devel, on the other hand, should require kmod-libs instead
of the main kmod package.

(credits for the text to David Shea)

Resolves: rhbz#1208554.

Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta(a)redhat.com&gt;
---
 kmod.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kmod.spec b/kmod.spec
index cd735cdd9432..678040b834d5 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -1,6 +1,6 @@
 Name:		kmod
 Version:	23
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Linux kernel module management utilities
 
 Group:		System Environment/Kernel
@@ -17,8 +17,6 @@ BuildRequires:	zlib-devel
 BuildRequires:	xz-devel
 BuildRequires:  libxslt
 
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-
 Provides:	module-init-tools = 4.0-1
 Obsoletes:	module-init-tools < 4.0-1
 Provides:	/sbin/modprobe
@@ -41,7 +39,7 @@ wishes to load or unload Linux kernel modules from the running system.
 %package devel
 Summary:	Header files for kmod development
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description devel
 The kmod-devel package provides header files used for development of
-- 
2.9.3

[Josh Boyer]

On Wed, Nov 30, 2016 at 8:06 AM, Yauheni Kaliuta
<yauheni.kaliuta(a)redhat.com&gt; wrote:
>  The main kmod package requires kmod-libs, via the "Requires:
>  %{name}-libs%{?_isa} = %{version}-%{release}" line in
>  kmod.spec. This is not actually necessary: /bin/kmod statically
>  links to libkmod (which is all that's in kmod-libs), and besides,
>  if it was dynamically linked rpm would generate the dependency
>  automatically.
>
>  kmod-devel, on the other hand, should require kmod-libs instead
>  of the main kmod package.
>
>  (credits for the text to David Shea)
>
>  Resolves: rhbz#1208554.
>
>  Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta(a)redhat.com&gt; 
ACK.

As I said in the bug, this won't result in any material change to the
on-disk installation since systemd requires kmod-libs.  However, it's
fine for correctness.

josh

> ---
>  kmod.spec | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/kmod.spec b/kmod.spec
> index cd735cdd9432..678040b834d5 100644
> --- a/kmod.spec
> +++ b/kmod.spec
> @@ -1,6 +1,6 @@
>  Name:          kmod
>  Version:       23
> -Release:       1%{?dist}
> +Release:       2%{?dist}
>  Summary:       Linux kernel module management utilities
>
>  Group:         System Environment/Kernel
> @@ -17,8 +17,6 @@ BuildRequires:        zlib-devel
>  BuildRequires: xz-devel
>  BuildRequires:  libxslt
>
> -Requires: %{name}-libs%{?_isa} = %{version}-%{release}
> -
>  Provides:      module-init-tools = 4.0-1
>  Obsoletes:     module-init-tools < 4.0-1
>  Provides:      /sbin/modprobe
> @@ -41,7 +39,7 @@ wishes to load or unload Linux kernel modules from the running
system.
>  %package devel
>  Summary:       Header files for kmod development
>  Group:         Development/Libraries
> -Requires:      %{name} = %{version}-%{release}
> +Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
>
>  %description devel
>  The kmod-devel package provides header files used for development of
> --
> 2.9.3
> _______________________________________________
> kmod-maint mailing list -- kmod-maint(a)lists.fedoraproject.org
> To unsubscribe send an email to kmod-maint-leave(a)lists.fedoraproject.org