-%define nmversion 2:1.2.0
+#
+# Conditional build:
+%bcond_without appindicator # application indicators
+#
+%define nm_ver 2:1.8
Summary: Network Manager for GNOME
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager-applet
-Version: 1.2.2
+Version: 1.36.0
Release: 1
License: GPL v2
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/1.2/network-manager-applet-%{version}.tar.xz
-# Source0-md5: 54b29dff37348fce09a567907688e172
+Source0: https://download.gnome.org/sources/network-manager-applet/1.36/network-manager-applet-%{version}.tar.xz
+# Source0-md5: 534f7142f4cfbd81d79eec5e62bc80a8
URL: https://wiki.gnome.org/Projects/NetworkManager
-BuildRequires: GConf2-devel >= 2.20.0
BuildRequires: ModemManager-devel >= 1.0.0
-BuildRequires: NetworkManager-devel >= %{nmversion}
-BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.11
-BuildRequires: dbus-devel >= 1.2.6
-BuildRequires: dbus-glib-devel >= 0.74
-BuildRequires: gettext-tools
-BuildRequires: glib2-devel >= 1:2.32
-BuildRequires: gnome-common
+BuildRequires: NetworkManager-devel >= %{nm_ver}
+BuildRequires: gcr-devel >= 3.14
+BuildRequires: gcr-ui-devel >= 3.14
+BuildRequires: gettext-tools >= 0.19.8
+BuildRequires: glib2-devel >= 1:2.40
BuildRequires: gobject-introspection-devel >= 0.9.6
-BuildRequires: gtk+3-devel >= 3.4
-BuildRequires: intltool >= 0.50.1
+BuildRequires: gtk+3-devel >= 3.10
BuildRequires: iso-codes
-BuildRequires: libgnome-keyring-devel >= 2.20.0
-BuildRequires: libnotify-devel >= 0.7.0
-BuildRequires: libsecret-devel
-BuildRequires: libtool >= 2:2.2.6
+BuildRequires: jansson-devel >= 2.7
+%{?with_appindicator:BuildRequires: libayatana-appindicator-gtk3-devel >= 0.1}
+%{?with_appindicator:BuildRequires: libdbusmenu-gtk3-devel >= 16.04.0}
+BuildRequires: libnma-devel >= 1.8.27
+BuildRequires: libsecret-devel >= 0.18
+BuildRequires: libselinux-devel
+BuildRequires: meson >= 0.46.0
+BuildRequires: ninja >= 1.5
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.592
+BuildRequires: rpmbuild(macros) >= 1.736
BuildRequires: tar >= 1:1.22
-BuildRequires: udev-glib-devel >= 1:147
BuildRequires: xz
-Requires(post,postun): glib2 >= 1:2.32
+Requires(post,postun): desktop-file-utils
+Requires(post,postun): glib2 >= 1:2.40
Requires(post,postun): gtk-update-icon-cache
-Requires: NetworkManager >= %{nmversion}
-Requires: NetworkManager-gtk-lib = %{version}-%{release}
-Requires: dbus >= 1.2.6
-Requires: dbus-glib >= 0.74
-Requires: glib2 >= 1:2.32
+Requires: NetworkManager >= %{nm_ver}
+Requires: glib2 >= 1:2.40
Requires: hicolor-icon-theme
+Requires: jansson >= 2.7
+Requires: libnma >= 1.8.27
+Requires: libsecret >= 0.18
Requires: mobile-broadband-provider-info
Requires: polkit-gnome
Suggests: dbus(org.freedesktop.Notifications)
-Obsoletes: NetworkManager-applet-devel
+Obsoletes: NetworkManager-applet-devel < 0.7.0
Obsoletes: gnome-bluetooth-plugin-nma < 1.2.2
-# sr@Latn vs. sr@latin
-Conflicts: glibc-misc < 6:2.7
+Conflicts: libnma-data < 1.10.4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
%description -l pl.UTF-8
Aplet zarządcy sieci dla GNOME.
-%package -n NetworkManager-gtk-lib
-Summary: GTK+ dialogs library for NetworkManager
-Summary(pl.UTF-8): Biblioteka okien dialogowych GTK+ dla NetworkManagera
-Group: X11/Libraries
-Requires: GConf2-libs >= 2.20.0
-Requires: NetworkManager-libs >= %{nmversion}
-Requires: glib2 >= 1:2.32
-Requires: gtk+3 >= 3.4
-Requires: udev-glib >= 1:147
-
-%description -n NetworkManager-gtk-lib
-GTK+ dialogs library for NetworkManager.
-
-%description -n NetworkManager-gtk-lib -l pl.UTF-8
-Biblioteka okien dialogowych GTK+ dla NetworkManagera.
-
-%package -n NetworkManager-gtk-lib-devel
-Summary: Development package for NetworkManager-gtk-lib
-Summary(pl.UTF-8): Pakiet programistyczny dla NetworkManager-gtk-lib
-Group: X11/Development/Libraries
-Requires: GConf2-devel >= 2.20.0
-Requires: NetworkManager-devel >= %{nmversion}
-Requires: NetworkManager-gtk-lib = %{version}-%{release}
-Requires: glib2-devel >= 1:2.32
-Requires: gtk+3-devel >= 3.4
-
-%description -n NetworkManager-gtk-lib-devel
-Header files and libraries for NetworkManager-gtk-lib.
-
-%description -n NetworkManager-gtk-lib-devel -l pl.UTF-8
-Pakiet programistyczny dla NetworkManager-gtk-lib.
-
%prep
%setup -q -n network-manager-applet-%{version}
%build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --disable-silent-rules \
- --disable-static \
- --enable-more-warnings=yes
-%{__make}
+%meson build \
+ -Dappindicator=%{?with_appindicator:ayatana}%{!?with_appindicator:no}
+
+%ninja_build -C build
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/{libnm-gtk,libnma}.la
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ie
%find_lang %{name} --with-gnome --all-name
%post
%update_icon_cache hicolor
%glib_compile_schemas
+%update_desktop_database_post
%postun
%update_icon_cache hicolor
if [ "$1" = "0" ]; then
%glib_compile_schemas
fi
-
-%post -n NetworkManager-gtk-lib -p /sbin/ldconfig
-%postun -n NetworkManager-gtk-lib -p /sbin/ldconfig
+%update_desktop_database_postun
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS CONTRIBUTING ChangeLog
+%doc AUTHORS CONTRIBUTING NEWS
%attr(755,root,root) %{_bindir}/nm-applet
%attr(755,root,root) %{_bindir}/nm-connection-editor
%{_datadir}/GConf/gsettings/nm-applet.convert
-%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
%dir %{_datadir}/gnome-vpn-properties
-%{_datadir}/nm-applet
-%{_datadir}/appdata/org.gnome.nm-connection-editor.appdata.xml
+%{_datadir}/metainfo/nm-connection-editor.appdata.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
%{_desktopdir}/nm-applet.desktop
%{_desktopdir}/nm-connection-editor.desktop
%{_mandir}/man1/nm-applet.1*
%{_mandir}/man1/nm-connection-editor.1*
-%{_iconsdir}/hicolor/*/apps/*.png
-%{_iconsdir}/hicolor/*/apps/*.svg
-
-%files -n NetworkManager-gtk-lib
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnm-gtk.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnm-gtk.so.0
-%attr(755,root,root) %{_libdir}/libnma.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnma.so.0
-%{_libdir}/girepository-1.0/NMA-1.0.typelib
-%{_libdir}/girepository-1.0/NMGtk-1.0.typelib
-%{_datadir}/libnm-gtk
-%{_datadir}/libnma
-
-%files -n NetworkManager-gtk-lib-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnm-gtk.so
-%attr(755,root,root) %{_libdir}/libnma.so
-%{_datadir}/gir-1.0/NMA-1.0.gir
-%{_datadir}/gir-1.0/NMGtk-1.0.gir
-%{_includedir}/libnm-gtk
-%{_includedir}/libnma
-%{_pkgconfigdir}/libnm-gtk.pc
-%{_pkgconfigdir}/libnma.pc
\ No newline at end of file
+%{_iconsdir}/hicolor/*x*/apps/nm-*.png
+%{_iconsdir}/hicolor/scalable/apps/nm-*.svg