# Conditional build:
%bcond_with appindicator # application indicators instead of xembed systray support
#
-%define nmversion 2:1.2.0
+%define nmversion 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.8.12
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: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/1.8/network-manager-applet-%{version}.tar.xz
+# Source0-md5: 90d3b1762f822497e3a5cc5771dd0f60
URL: https://wiki.gnome.org/Projects/NetworkManager
BuildRequires: ModemManager-devel >= 1.0.0
BuildRequires: NetworkManager-devel >= %{nmversion}
BuildRequires: automake >= 1:1.11
BuildRequires: dbus-devel >= 1.2.6
BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: gcr-devel >= 3.14
BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 1:2.32
-BuildRequires: gnome-common
BuildRequires: gobject-introspection-devel >= 0.9.6
BuildRequires: gtk+3-devel >= 3.4
+BuildRequires: gtk-doc >= 1.0
BuildRequires: intltool >= 0.50.1
BuildRequires: iso-codes
+BuildRequires: jansson-devel >= 2.3
%{?with_appindicator:BuildRequires: libappindicator-gtk3-devel >= 0.1}
%{?with_appindicator:BuildRequires: libdbusmenu-gtk3-devel >= 16.04.0}
BuildRequires: libnotify-devel >= 0.7.0
Requires: dbus-glib >= 0.74
Requires: glib2 >= 1:2.32
Requires: hicolor-icon-theme
+Requires: jansson >= 2.3
Requires: mobile-broadband-provider-info
Requires: polkit-gnome
Suggests: dbus(org.freedesktop.Notifications)
Summary(pl.UTF-8): Biblioteka okien dialogowych GTK+ dla NetworkManagera
Group: X11/Libraries
Requires: NetworkManager-libs >= %{nmversion}
+Requires: gcr >= 3.14
Requires: glib2 >= 1:2.32
Requires: gtk+3 >= 3.4
Requires: udev-glib >= 1:147
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
+Summary: Development package for NetworkManager GTK+ libraries
+Summary(pl.UTF-8): Pakiet programistyczny bibliotek GTK+ NetworkManagera
Group: X11/Development/Libraries
Requires: NetworkManager-devel >= %{nmversion}
Requires: NetworkManager-gtk-lib = %{version}-%{release}
Requires: gtk+3-devel >= 3.4
%description -n NetworkManager-gtk-lib-devel
-Header files and libraries for NetworkManager-gtk-lib.
+Header files for NetworkManager GTK+ libraries.
%description -n NetworkManager-gtk-lib-devel -l pl.UTF-8
-Pakiet programistyczny dla NetworkManager-gtk-lib.
+Pakiet programistyczny bibliotek GTK+ NetworkManagera.
+
+%package -n NetworkManager-gtk-lib-apidocs
+Summary: API documentation for NMA (NetworkManager Applet) library
+Summary(pl.UTF-8): Dokumentacja API biblioteki NMA (NetworkManager Applet)
+Group: Documentation
+
+%description -n NetworkManager-gtk-lib-apidocs
+API documentation for NMA (NetworkManager Applet) library.
+
+%description -n NetworkManager-gtk-lib-apidocs -l pl.UTF-8
+Dokumentacja API biblioteki NMA (NetworkManager Applet).
%prep
%setup -q -n network-manager-applet-%{version}
--disable-silent-rules \
--disable-static \
--enable-more-warnings=yes \
- %{?with_appindicator:--with-appindicator}
+ %{?with_appindicator:--with-appindicator} \
+ --with-html-dir=%{_gtkdocdir}
%{__make}
%install
%{_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}/appdata/nm-connection-editor.appdata.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
+%{_iconsdir}/hicolor/*x*/apps/nm-*.png
+%{_iconsdir}/hicolor/scalable/apps/nm-*.svg
%files -n NetworkManager-gtk-lib
%defattr(644,root,root,755)
%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)
%{_includedir}/libnma
%{_pkgconfigdir}/libnm-gtk.pc
%{_pkgconfigdir}/libnma.pc
+
+%files -n NetworkManager-gtk-lib-apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/libnma