-%define nmversion %{version}
+# Conditional build:
+%bcond_with gnomebt # GNOME-Bluetooth plugin
+#
+%define nmversion 2:1.0.0
Summary: Network Manager for GNOME
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager-applet
-Version: 0.8.1
-Release: 3
+Version: 1.0.4
+Release: 1
License: GPL v2
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.8/network-manager-applet-%{version}.tar.bz2
-# Source0-md5: b709808c1a5cfe8236061b5da4907313
-Patch0: %{name}-build.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/1.0/network-manager-applet-%{version}.tar.xz
+# Source0-md5: 7fc2ed3f0c46ed41ddabe99d51513b1c
URL: http://projects.gnome.org/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.10
+BuildRequires: automake >= 1:1.11
BuildRequires: dbus-devel >= 1.2.6
BuildRequires: dbus-glib-devel >= 0.74
-BuildRequires: gettext-devel
-BuildRequires: gnome-bluetooth-devel >= 2.28.0
-BuildRequires: gtk+2-devel >= 2:2.14.0
-BuildRequires: intltool >= 0.36.2
-BuildRequires: libglade2-devel
+BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= 1:2.32
+%{?with_gnomebt:BuildRequires: gnome-bluetooth-devel < 3.11}
+%{?with_gnomebt:BuildRequires: gnome-bluetooth-devel >= 2.28.0}
+BuildRequires: gnome-common
+BuildRequires: gobject-introspection-devel >= 0.9.6
+BuildRequires: gtk+3-devel >= 3.4
+BuildRequires: intltool >= 0.40.0
+BuildRequires: iso-codes
BuildRequires: libgnome-keyring-devel >= 2.20.0
-BuildRequires: libiw-devel >= 1:28-0.pre9.1
-BuildRequires: libnotify-devel >= 0.4.3
-BuildRequires: libtool
+BuildRequires: libnotify-devel >= 0.7.0
+BuildRequires: libsecret-devel
+BuildRequires: libtool >= 2:2.2.6
BuildRequires: pkgconfig
-BuildRequires: polkit-devel >= 0.92
-BuildRequires: rpmbuild(macros) >= 1.311
-Requires(post,postun): gtk+2
+BuildRequires: rpmbuild(macros) >= 1.592
+BuildRequires: tar >= 1:1.22
+BuildRequires: udev-glib-devel >= 1:147
+BuildRequires: xz
+Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): hicolor-icon-theme
Requires(post,preun): GConf2
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: mobile-broadband-provider-info
Requires: polkit-gnome
Suggests: dbus(org.freedesktop.Notifications)
%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.
+
%package -n gnome-bluetooth-plugin-nma
Summary: NetworkManager applet plugin for GNOME Bluetooth
Summary(pl.UTF-8): Wtyczka NetworkManager Applet dla GNOME Bluetooth
Group: X11/Applications
-Requires: NetworkManager-applet >= %{nmversion}
+Requires: %{name} = %{version}-%{release}
Requires: gnome-bluetooth >= 2.28.0
%description -n gnome-bluetooth-plugin-nma
%prep
%setup -q -n network-manager-applet-%{version}
-%patch0 -p1
%build
%{__intltoolize}
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure
+%configure \
+ --disable-silent-rules \
+ --disable-static \
+ --enable-more-warnings=yes \
+ %{!?with_gnomebt:--without-bluetooth}
%{__make}
%install
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.{a,la}
+%if %{with gnomebt}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.la
+%endif
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnm-gtk.la
%find_lang %{name} --with-gnome --all-name
%post
%update_icon_cache hicolor
-%gconf_schema_install nm-applet.schemas
-
-%preun
-%gconf_schema_uninstall nm-applet.schemas
+%glib_compile_schemas
%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
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS CONTRIBUTING ChangeLog NEWS README
+%doc AUTHORS CONTRIBUTING ChangeLog
%attr(755,root,root) %{_bindir}/nm-applet
%attr(755,root,root) %{_bindir}/nm-connection-editor
-%{_sysconfdir}/gconf/schemas/nm-applet.schemas
+%attr(755,root,root) %{_libexecdir}/nm-applet-migration-tool
+%{_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
%{_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
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-applet.conf
+%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
+%{_libdir}/girepository-1.0/NMGtk-1.0.typelib
+%{_datadir}/libnm-gtk
+
+%files -n NetworkManager-gtk-lib-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnm-gtk.so
+%{_datadir}/gir-1.0/NMGtk-1.0.gir
+%{_includedir}/libnm-gtk
+%{_pkgconfigdir}/libnm-gtk.pc
+
+%if %{with gnomebt}
%files -n gnome-bluetooth-plugin-nma
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/gnome-bluetooth/plugins/libnma.so
+%endif