Fix rpm dependencies

This change updates the rpm spec files to have strictly correct
package dependencies.  That means a few things:

* Add a dependency to the spl package for the spl-modules package.
  This ensures that when running 'yum install spl' that newest
  version of the spl-modules will be installed.

* Remove the redundant distribution release extension.  This
  is already added once because it is part of the kernel package
  release name.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/spl-modules.spec.in b/spl-modules.spec.in
index 7e01b2ce2e86e9d6ecd4d2e54005f565fcdfebbf..ace5cbcd60d543d2fd6a066a9ef6dd19a2884be0 100644 (file)
--- a/spl-modules.spec.in
+++ b/spl-modules.spec.in
@@ -178,7 +178,7 @@ Summary:         Solaris Porting Layer Modules
 Group:           Utilities/System
 Name:            %{name}
 Version:         %{version}
-Release:         %{release}%{?dist}
+Release:         %{release}
 License:         @LICENSE@
 URL:             git://github.com/zfsonlinux/spl.git
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id} -un)

diff --git a/spl.spec.in b/spl.spec.in
index 7ade5f1639c321e0614e6bc0fe5da80f3492337d..673cf129f4bb52bdaac77f28ca56eea2da31a390 100644 (file)
--- a/spl.spec.in
+++ b/spl.spec.in
@@ -12,6 +12,7 @@ License:         @LICENSE@
 URL:             git://github.com/zfsonlinux/spl.git
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id} -un)
 Source:          %{name}-%{version}.tar.gz
+Requires:        spl-modules
 
 %description
 The %{name} package contains the support utilities for the spl.