diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-01-15 15:31:43 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-01-16 12:15:51 +0100 |
| commit | 8ba46ff4c6248507e4e0f3dbcdcfb6686e3a45be (patch) | |
| tree | d006a45b51631cd0f8068b3103e4fc153bcd0ad3 | |
| parent | bfff3ecfb0ab918369a7f628b195fa1446edbd7b (diff) | |
| download | NetworkManager-8ba46ff4c6248507e4e0f3dbcdcfb6686e3a45be.tar.gz | |
rpm: disable libnm-glib for Fedora 29 and RHEL 8
While at it, move the API documentation to libnm-devel.
There doesn't seem to be a better place for it.
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 3d15ee550e..b38163a4ab 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -62,6 +62,11 @@ %endif %bcond_without test %bcond_with sanitizer +%if 0%{?fedora} > 28 || 0%{?rhel} > 7 +%bcond_with libnm_glib +%else +%bcond_without libnm_glib +%endif ############################################################################### @@ -484,7 +489,12 @@ intltoolize --automake --copy --force --with-config-plugins-default='ifcfg-rh,ibft' \ --with-config-dns-rc-manager-default=symlink \ --with-config-logging-backend-default=journal \ - --enable-json-validation + --enable-json-validation \ +%if %{with libnm_glib} + --with-libnm-glib +%else + --without-libnm-glib +%endif make %{?_smp_mflags} @@ -651,13 +661,16 @@ fi %{_libdir}/%{name}/libnm-ppp-plugin.so %endif +%if %{with libnm_glib} %files glib -f %{name}.lang %{_libdir}/libnm-glib.so.* %{_libdir}/libnm-glib-vpn.so.* %{_libdir}/libnm-util.so.* %{_libdir}/girepository-1.0/NetworkManager-1.0.typelib %{_libdir}/girepository-1.0/NMClient-1.0.typelib +%endif +%if %{with libnm_glib} %files glib-devel %doc docs/api/html/* %dir %{_includedir}/libnm-glib @@ -684,10 +697,9 @@ fi %{_datadir}/gtk-doc/html/libnm-glib/* %dir %{_datadir}/gtk-doc/html/libnm-util %{_datadir}/gtk-doc/html/libnm-util/* -%dir %{_datadir}/gtk-doc/html/NetworkManager -%{_datadir}/gtk-doc/html/NetworkManager/* %{_datadir}/vala/vapi/libnm-*.deps %{_datadir}/vala/vapi/libnm-*.vapi +%endif %files libnm -f %{name}.lang %{_libdir}/libnm.so.* @@ -702,6 +714,8 @@ fi %{_datadir}/gir-1.0/NM-1.0.gir %dir %{_datadir}/gtk-doc/html/libnm %{_datadir}/gtk-doc/html/libnm/* +%dir %{_datadir}/gtk-doc/html/NetworkManager +%{_datadir}/gtk-doc/html/NetworkManager/* %{_datadir}/vala/vapi/libnm.deps %{_datadir}/vala/vapi/libnm.vapi %{_datadir}/dbus-1/interfaces/*.xml |