[PATCH rhel7-branch] Adapt to NetworkManager package split-up

[Radek Vykydal]

---
 anaconda.spec.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/anaconda.spec.in b/anaconda.spec.in
index 53fb340..4fcc10a 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -28,7 +28,7 @@ Source1: anaconda-user-help-%{helpver}.tar.gz
 %define partedver 1.8.1
 %define pypartedver 2.5-2
 %define pythonpyblockver 0.45
-%define nmver 1:0.7.1-3.git20090414
+%define nmver 1.0.0-6.git20150107
 %define dbusver 1.2.3
 %define yumutilsver 1.1.11-3
 %define mehver 0.25.2-1
@@ -125,6 +125,7 @@ Requires: isomd5sum >= %{isomd5sum}
 Requires: yum-utils >= %{yumutilsver}
 Requires: createrepo
 Requires: NetworkManager >= %{nmver}
+Requires: NetworkManager-team
 Requires: dhclient
 Requires: kbd
 Requires: chrony
@@ -174,6 +175,9 @@ Requires: nm-connection-editor
 Requires: zenity
 %endif
 Requires: yelp
+%ifnarch s390 s390x
+Requires: NetworkManager-wifi
+%endif

%description gui
 This package contains graphical user interface for the Anaconda installer.

[Vratislav Podzimek]

On Thu, 2015-01-15 at 17:03 +0100, Radek Vykydal wrote:
> anaconda.spec.in | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/anaconda.spec.in b/anaconda.spec.in
> index 53fb340..4fcc10a 100644
> --- a/anaconda.spec.in
> +++ b/anaconda.spec.in
> @@ -28,7 +28,7 @@ Source1: anaconda-user-help-%{helpver}.tar.gz
>  %define partedver 1.8.1
>  %define pypartedver 2.5-2
>  %define pythonpyblockver 0.45
> -%define nmver 1:0.7.1-3.git20090414
> +%define nmver 1.0.0-6.git20150107
>  %define dbusver 1.2.3
>  %define yumutilsver 1.1.11-3
>  %define mehver 0.25.2-1
> @@ -125,6 +125,7 @@ Requires: isomd5sum >= %{isomd5sum}
>  Requires: yum-utils >= %{yumutilsver}
>  Requires: createrepo
>  Requires: NetworkManager >= %{nmver}
> +Requires: NetworkManager-team
>  Requires: dhclient
>  Requires: kbd
>  Requires: chrony
> @@ -174,6 +175,9 @@ Requires: nm-connection-editor
>  Requires: zenity
>  %endif
>  Requires: yelp
> +%ifnarch s390 s390x
> +Requires: NetworkManager-wifi
> +%endif
>
> %description gui
>  This package contains graphical user interface for the Anaconda installer.

ACK.

[Brian C. Lane]

On Thu, Jan 15, 2015 at 05:03:11PM +0100, Radek Vykydal wrote:

Please make sure the bug is referenced when you push this.

[Radek Vykydal]

Yep, thanks for reminding me.
Also, you've added NetworkManager-glib to master's
Requires, should we require it on rhel7-branch too?
Just adding NetworkManager-team worked for me
testing it with updates.img, but I might be missing
something.

On 01/16/2015 11:44 PM, Brian C. Lane wrote:
> On Thu, Jan 15, 2015 at 05:03:11PM +0100, Radek Vykydal wrote:
>
> Please make sure the bug is referenced when you push this.

[Brian C. Lane]

On Mon, Jan 19, 2015 at 09:46:15AM +0100, Radek Vykydal wrote:
> Yep, thanks for reminding me.
> Also, you've added NetworkManager-glib to master's
> Requires, should we require it on rhel7-branch too?
> Just adding NetworkManager-team worked for me
> testing it with updates.img, but I might be missing
> something.

I haven't seen any problems with the deps there so I think it is getting
pulled in correctly. On rawhide they changed things so that it was
getting included by any of our deps.