diff --git a/subscription-manager.spec b/subscription-manager.spec index f24130f..b1e4147 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -102,7 +102,7 @@ Summary: Tools and libraries for subscription and repository management Group: Productivity/Networking/System License: GPL-2.0 %else -License: GPLv2 +License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later %endif URL: http://www.candlepinproject.org/ @@ -130,7 +130,7 @@ Source2: subscription-manager-rpmlintrc # nesting is required since RPM requires the various preamble directives to be # at the start of a line making meaningful indentation impossible. -Requires: %{py_package_prefix}-ethtool +Requires: iproute Requires: %{py_package_prefix}-iniparse Requires: %{py_package_prefix}-decorator Requires: virt-what @@ -164,7 +164,7 @@ Requires: %{py_package_prefix}-setuptools %if %{use_dnf} %if %{create_libdnf_rpm} -Requires: dnf >= 1.0.0 +Requires: python3-dnf Requires: python3-dnf-plugins-core Requires: python3-librepo %else @@ -201,6 +201,8 @@ BuildRequires: %{py_package_prefix}-dateutil BuildRequires: systemd +Obsoletes: subscription-manager-migration <= %{version}-%{release} + Obsoletes: subscription-manager-initial-setup-addon <= %{version}-%{release} Obsoletes: rhsm-gtk <= %{version}-%{release} @@ -248,9 +250,6 @@ BuildRequires: cmake BuildRequires: gcc BuildRequires: json-c-devel BuildRequires: libdnf-devel >= 0.22.5 -Requires: json-c -Requires: libdnf >= 0.22.5 -Requires: dnf >= 1.0.0 Obsoletes: dnf-plugin-subscription-manager < 1.29.0