rpms/network-manager-applet
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Disable libnm-gtk on RHEL 8 & Fedora 29

Browse Source 
By that now nothing should be using it anymore. Also drop some
superfluous dependencies (either useless or generated automatically).

No need to bump revision & do a build yet.
This commit is contained in:
Lubomir Rintel 2018-01-17 14:45:42 +01:00
parent 193fd7c6cb
commit f176f6f505
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
network-manager-applet.spec
View File

@ -9,6 +9,12 @@
%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p') %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
%if 0%{?fedora} > 28 || 0%{?rhel} > 7
%bcond_with libnm_gtk
%else
%bcond_without libnm_gtk
%endif
Name: network-manager-applet Name: network-manager-applet
Summary: A network control and status applet for NetworkManager Summary: A network control and status applet for NetworkManager
Version: %{rpm_version} Version: %{rpm_version}
@ -22,13 +28,13 @@ Source: https://download.gnome.org/sources/network-manager-applet/%{real_version
Patch1: 0001-nm-applet-no-notifications.patch Patch1: 0001-nm-applet-no-notifications.patch
Requires: NetworkManager >= %{nm_version} Requires: NetworkManager >= %{nm_version}
Requires: NetworkManager-glib >= %{nm_version}
Requires: libnma%{?_isa} = %{version}-%{release}
Requires: libnotify >= 0.4.3 Requires: libnotify >= 0.4.3
Requires: nm-connection-editor = %{version}-%{release} Requires: nm-connection-editor = %{version}-%{release}
%if %{with libnm_gtk}
BuildRequires: NetworkManager-devel >= %{nm_version} BuildRequires: NetworkManager-devel >= %{nm_version}
BuildRequires: NetworkManager-glib-devel >= %{nm_version} BuildRequires: NetworkManager-glib-devel >= %{nm_version}
%endif
BuildRequires: NetworkManager-libnm-devel >= %{nm_version} BuildRequires: NetworkManager-libnm-devel >= %{nm_version}
BuildRequires: ModemManager-glib-devel >= 1.0 BuildRequires: ModemManager-glib-devel >= 1.0
BuildRequires: glib2-devel >= 2.32 BuildRequires: glib2-devel >= 2.32
@ -56,8 +62,6 @@ for use with NetworkManager.
%package -n nm-connection-editor %package -n nm-connection-editor
Summary: A network connection configuration editor for NetworkManager Summary: A network connection configuration editor for NetworkManager
Requires: NetworkManager-glib >= %{nm_version}
Requires: libnma%{?_isa} = %{version}-%{release}
%description -n nm-connection-editor %description -n nm-connection-editor
This package contains a network configuration editor and Bluetooth modem This package contains a network configuration editor and Bluetooth modem
@ -127,7 +131,12 @@ This package deprecates libnm-gtk.
%meson \ %meson \
-Dgcr=true \ -Dgcr=true \
-Dselinux=true \ -Dselinux=true \
-Ddisable-static=true -Ddisable-static=true \
%if %{with libnm_gtk}
-Dlibnm_gtk=true
%else
-Dlibnm_gtk=false
%endif
%meson_build %meson_build
%install %install
@ -209,16 +218,20 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_mandir}/man1/nm-connection-editor* %{_mandir}/man1/nm-connection-editor*
%dir %{_datadir}/gnome-vpn-properties %dir %{_datadir}/gnome-vpn-properties
%if %{with libnm_gtk}
%files -n libnm-gtk %files -n libnm-gtk
%{_libdir}/libnm-gtk.so.* %{_libdir}/libnm-gtk.so.*
%{_libdir}/girepository-1.0/NMGtk-1.0.typelib %{_libdir}/girepository-1.0/NMGtk-1.0.typelib
%endif
%if %{with libnm_gtk}
%files -n libnm-gtk-devel %files -n libnm-gtk-devel
%dir %{_includedir}/libnm-gtk %dir %{_includedir}/libnm-gtk
%{_includedir}/libnm-gtk/*.h %{_includedir}/libnm-gtk/*.h
%{_libdir}/pkgconfig/libnm-gtk.pc %{_libdir}/pkgconfig/libnm-gtk.pc
%{_libdir}/libnm-gtk.so %{_libdir}/libnm-gtk.so
%{_datadir}/gir-1.0/NMGtk-1.0.gir %{_datadir}/gir-1.0/NMGtk-1.0.gir
%endif
%files -n libnma %files -n libnma
%{_libdir}/libnma.so.* %{_libdir}/libnma.so.*