diff options
Diffstat (limited to 'contrib/fedora/rpm/NetworkManager.spec')
-rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 04f78a205c..e1bdc45235 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -26,6 +26,7 @@ %global systemd_dir %{_prefix}/lib/systemd/system %global nmlibdir %{_prefix}/lib/%{name} +%global nmplugindir %{_libdir}/%{name}/%{version}-%{release} %global _hardened_build 1 @@ -528,7 +529,7 @@ ln -s ../10-ifcfg-rh-routes.sh %{buildroot}%{_sysconfdir}/%{name}/dispatcher.d/n rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la -rm -f %{buildroot}%{_libdir}/NetworkManager/*.la +rm -f %{buildroot}%{nmplugindir}/*.la # Ensure the documentation timestamps are constant to avoid multilib conflicts find %{buildroot}%{_datadir}/gtk-doc -exec touch --reference configure.ac '{}' \+ @@ -604,8 +605,9 @@ fi %{_libexecdir}/nm-dhcp-helper %{_libexecdir}/nm-dispatcher %{_libexecdir}/nm-iface-helper -%dir %{_libdir}/NetworkManager -%{_libdir}/NetworkManager/libnm-settings-plugin*.so +%dir %{_libdir}/%{name} +%dir %{nmplugindir} +%{nmplugindir}/libnm-settings-plugin*.so %if %{with nmtui} %exclude %{_mandir}/man1/nmtui* %endif @@ -635,35 +637,35 @@ fi %if %{with adsl} %files adsl -%{_libdir}/%{name}/libnm-device-plugin-adsl.so +%{nmplugindir}/libnm-device-plugin-adsl.so %else -%exclude %{_libdir}/%{name}/libnm-device-plugin-adsl.so +%exclude %{nmplugindir}/libnm-device-plugin-adsl.so %endif %if %{with bluetooth} %files bluetooth -%{_libdir}/%{name}/libnm-device-plugin-bluetooth.so +%{nmplugindir}/libnm-device-plugin-bluetooth.so %endif %if %{with team} %files team -%{_libdir}/%{name}/libnm-device-plugin-team.so +%{nmplugindir}/libnm-device-plugin-team.so %endif %if %{with wifi} %files wifi -%{_libdir}/%{name}/libnm-device-plugin-wifi.so +%{nmplugindir}/libnm-device-plugin-wifi.so %endif %if %{with wwan} %files wwan -%{_libdir}/%{name}/libnm-device-plugin-wwan.so -%{_libdir}/%{name}/libnm-wwan.so +%{nmplugindir}/libnm-device-plugin-wwan.so +%{nmplugindir}/libnm-wwan.so %endif %if %{with ovs} %files ovs -%{_libdir}/%{name}/libnm-device-plugin-ovs.so +%{nmplugindir}/libnm-device-plugin-ovs.so %{systemd_dir}/NetworkManager.service.d/NetworkManager-ovs.conf %{_mandir}/man7/nm-openvswitch.7* %endif @@ -671,7 +673,7 @@ fi %if %{with ppp} %files ppp %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so -%{_libdir}/%{name}/libnm-ppp-plugin.so +%{nmplugindir}/libnm-ppp-plugin.so %endif %if %{with libnm_glib} |