diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-12-19 13:30:39 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-12-19 13:52:07 +0100 |
| commit | 2fc37ce8952bc3cdde85afcc58e6650d28189e69 (patch) | |
| tree | 2d75d0b235cda316c53772386744b9b628f6e16b | |
| parent | 6f343b866e8241444bf7ca661552c0fc160ef15a (diff) | |
| download | NetworkManager-2fc37ce8952bc3cdde85afcc58e6650d28189e69.tar.gz | |
contrib/rpm: exclude device plugins for ADSL and Wi-Fi on s390
s390 does not enable several device plugins, but ADSL and Wi-Fi
plugins are still build. They must be excluded in the spec file,
otherwise rpmbuild fails.
This partly reverts commit 1f631cd08d0f01cd118e7222822518d62916f117.
Checking for unpackaged file(s): /usr/lib/rpm/check-files /builddir/build/BUILDROOT/NetworkManager-1.1.0-11242.9709d009d5.el7.s390x
RPM build errors:
error: Installed (but unpackaged) file(s) found:
/usr/lib64/NetworkManager/libnm-device-plugin-adsl.so
/usr/lib64/NetworkManager/libnm-device-plugin-wifi.so
Installed (but unpackaged) file(s) found:
/usr/lib64/NetworkManager/libnm-device-plugin-adsl.so
/usr/lib64/NetworkManager/libnm-device-plugin-wifi.so
Child returncode was: 1
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 106a15bc64..95f41d5393 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -554,6 +554,8 @@ fi %files adsl %defattr(-,root,root,0755) %{_libdir}/%{name}/libnm-device-plugin-adsl.so +%else +%exclude %{_libdir}/%{name}/libnm-device-plugin-adsl.so %endif %if 0%{?with_bluetooth} @@ -572,6 +574,8 @@ fi %files wifi %defattr(-,root,root,0755) %{_libdir}/%{name}/libnm-device-plugin-wifi.so +%else +%exclude %{_libdir}/%{name}/libnm-device-plugin-wifi.so %endif %if 0%{?with_wwan} |