rpms/NetworkManager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix Requires/Provides on subpackages

Browse Source 
NetworkManager-wifi and NetworkManager-glib-devel should require
NetworkManager, not provide it.

https://bugzilla.redhat.com/show_bug.cgi?id=1454505
This commit is contained in:
Stephen Gallagher 2017-05-22 20:06:43 -04:00 committed by Lubomir Rintel
parent 46b9e17739
commit 0cc505ca29
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
NetworkManager.spec
View File

@ -9,7 +9,7 @@
%global epoch_version 1 %global epoch_version 1
%global rpm_version 1.8.2 %global rpm_version 1.8.2
%global real_version 1.8.2 %global real_version 1.8.2
%global release_version 1 %global release_version 2
%global snapshot %{nil} %global snapshot %{nil}
%global git_sha %{nil} %global git_sha %{nil}
@ -235,7 +235,7 @@ Summary: PPP plugin for NetworkManager
Group: System Environment/Base Group: System Environment/Base
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Requires: ppp = %{ppp_version} Requires: ppp = %{ppp_version}
Provides: NetworkManager = %{epoch}:%{version}-%{release} Requires: NetworkManager = %{epoch}:%{version}-%{release}
Obsoletes: NetworkManager < %{obsoletes_ppp_plugin} Obsoletes: NetworkManager < %{obsoletes_ppp_plugin}
%description ppp %description ppp
@ -263,8 +263,8 @@ Requires: %{name}-glib%{?_isa} = %{epoch}:%{version}-%{release}
Requires: glib2-devel Requires: glib2-devel
Requires: pkgconfig Requires: pkgconfig
Requires: dbus-glib-devel >= %{dbus_glib_version} Requires: dbus-glib-devel >= %{dbus_glib_version}
Provides: %{name}-devel = %{epoch}:%{version}-%{release} Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Provides: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release} Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
%description glib-devel %description glib-devel
@ -652,6 +652,10 @@ fi
%endif %endif
%changelog %changelog
* Thu Jul 20 2017 Stephen Gallagher <sgallagh@redhat.com> - 1:1.8.2-2
- NetworkManager-wifi and NetworkManager-glib-devel should require
NetworkManager, not provide it.
* Mon Jul 17 2017 Beniamino Galvani <bgalvani@redhat.com> - 1:1.8.2-1 * Mon Jul 17 2017 Beniamino Galvani <bgalvani@redhat.com> - 1:1.8.2-1
- Update to 1.8.2 release - Update to 1.8.2 release
- dhcp/dhclient: improve "interface" statement parsing - dhcp/dhclient: improve "interface" statement parsing