-# TODO: missing BRs (ac/am/??? - don't hide them behind autoreconf call)
+%define nmversion %{version}
Summary: Network Manager for GNOME
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager-applet
-Version: 0.6.5
-Release: 1
+Version: 0.8.2
+Release: 3
License: GPL v2
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.6/network-manager-applet-%{version}.tar.bz2
-# Source0-md5: 1c94a41e2399d261985a75f0cd3b895b
-BuildRequires: GConf2-devel >= 2.0
-BuildRequires: NetworkManager-devel >= 0.6.5
-BuildRequires: dbus-glib-devel >= 0.60
+Source0: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.8/network-manager-applet-%{version}.tar.bz2
+# Source0-md5: e35d3c391edca440c24032e05870c130
+URL: http://projects.gnome.org/NetworkManager/
+BuildRequires: GConf2-devel >= 2.20.0
+BuildRequires: NetworkManager-devel >= %{nmversion}
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.10
+BuildRequires: dbus-devel >= 1.2.6
+BuildRequires: dbus-glib-devel >= 0.74
BuildRequires: gettext-devel
-BuildRequires: gnome-keyring-devel
-BuildRequires: gnome-panel-devel >= 2.0
-BuildRequires: gtk+2-devel >= 1:2.0
-BuildRequires: hal-devel >= 0.5.2
-BuildRequires: libgcrypt-devel
-BuildRequires: libglade2-devel >= 1:2.0
-BuildRequires: libiw-devel >= 1:28
-BuildRequires: libnl-devel >= 1.0
-BuildRequires: libnotify-devel >= 0.3.0
+BuildRequires: gnome-bluetooth-devel >= 2.28.0
+BuildRequires: gnome-common
+BuildRequires: gtk+2-devel >= 2:2.14.0
+BuildRequires: intltool >= 0.36.2
+BuildRequires: libglade2-devel
+BuildRequires: libgnome-keyring-devel >= 2.20.0
+BuildRequires: libiw-devel >= 1:28-0.pre9.1
+BuildRequires: libnotify-devel >= 0.4.3
+BuildRequires: libtool
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.268
-Requires(post): /sbin/ldconfig
-Requires(post,preun): /sbin/chkconfig
-Requires: NetworkManager >= 0.6.5
+BuildRequires: polkit-devel >= 0.92
+BuildRequires: rpmbuild(macros) >= 1.311
+Requires(post,postun): gtk-update-icon-cache
+Requires(post,postun): hicolor-icon-theme
+Requires(post,preun): GConf2
+Requires: NetworkManager >= %{nmversion}
+Requires: dbus >= 1.2.6
+Requires: mobile-broadband-provider-info
+Requires: polkit-gnome
+Suggests: dbus(org.freedesktop.Notifications)
+Obsoletes: NetworkManager-applet-devel
+# sr@Latn vs. sr@latin
+Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
%description -l pl.UTF-8
Aplet zarządcy sieci dla GNOME.
+%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: gnome-bluetooth >= 2.28.0
+
+%description -n gnome-bluetooth-plugin-nma
+NetworkManager applet plugin for GNOME Bluetooth.
+
+%description -n gnome-bluetooth-plugin-nma -l pl.UTF-8
+Wtyczka NetworkManager Applet dla GNOME Bluetooth.
+
%prep
-%setup -q -n nm-applet-%{version}
+%setup -q -n network-manager-applet-%{version}
%build
-autoreconf
-%configure
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+ --disable-silent-rules
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.{a,la}
+
%find_lang %{name} --with-gnome --all-name
%clean
rm -rf $RPM_BUILD_ROOT
%post
-%gconf_schema_install
+%update_icon_cache hicolor
+%gconf_schema_install nm-applet.schemas
+
+%preun
+%gconf_schema_uninstall nm-applet.schemas
+
+%postun
+%update_icon_cache hicolor
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_datadir}/nm-applet
+%doc AUTHORS CONTRIBUTING ChangeLog NEWS README
+%attr(755,root,root) %{_bindir}/nm-applet
+%attr(755,root,root) %{_bindir}/nm-connection-editor
+%{_sysconfdir}/gconf/schemas/nm-applet.schemas
+%dir %{_datadir}/gnome-vpn-properties
+%{_datadir}/nm-applet
+%{_sysconfdir}/xdg/autostart/nm-applet.desktop
+%{_desktopdir}/nm-connection-editor.desktop
%{_iconsdir}/hicolor/*/apps/*.png
-%{_sysconfdir}/dbus-1/system.d/*
-%{_datadir}/gnome/autostart/*.desktop
+%{_iconsdir}/hicolor/*/apps/*.svg
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-applet.conf
+
+%files -n gnome-bluetooth-plugin-nma
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gnome-bluetooth/plugins/libnma.so