diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-12-19 12:00:34 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-12-19 12:35:36 +0100 |
| commit | 6f343b866e8241444bf7ca661552c0fc160ef15a (patch) | |
| tree | 7db022c530781c23cb5bcbb4663c2384e0904d43 /contrib | |
| parent | c5e998441cc0d1868da1361f0c7b73abc9f29244 (diff) | |
| download | NetworkManager-6f343b866e8241444bf7ca661552c0fc160ef15a.tar.gz | |
contrib/rpm: fix spec file for s390/s390x
On s390/s390x we would disable hardware plugins, especially %{with_bluetooth} and
%{with_wwan}. Depending on that we would set 'BuildRequires: ModemManager-glib-devel'.
This was not corresponding to the '--with-modem-manager-1' configure
option, hence we did not have ModemManager-glib-devel, but
'--with-modem-manager-1=yes'
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index a54430dad7..106a15bc64 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -71,6 +71,10 @@ %global with_team 0 %endif +%define with_modem_manager_1 0 +%if 0%{?with_bluetooth} || (0%{?with_wwan} && (0%{?rhel} || (0%{?fedora} && 0%{?fedora} > 19))) +%define with_modem_manager_1 1 +%endif %global _hardened_build 1 @@ -160,7 +164,7 @@ BuildRequires: wimax-devel BuildRequires: systemd >= 200-3 systemd-devel BuildRequires: libsoup-devel BuildRequires: libndp-devel >= 1.0 -%if 0%{?with_bluetooth} || (0%{?with_wwan} && (0%{?rhel} || (0%{?fedora} && 0%{?fedora} > 19))) +%if 0%{?with_modem_manager_1} BuildRequires: ModemManager-glib-devel >= 1.0 %endif %if 0%{?with_nmtui} @@ -389,7 +393,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment. --with-crypto=nss \ --enable-more-warnings=error \ --enable-ppp=yes \ -%if 0%{?rhel} || (0%{?fedora} > 19) +%if 0%{?with_modem_manager_1} --with-modem-manager-1=yes \ %else --with-modem-manager-1=no \ |