-# TODO:
-# - add a working(!) pld backend... (it work's 4 me as it is now - czarny)
-# - add requires for devel (if any)
+# 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.6.5
+Version: 1.0.6
Release: 1
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
-BuildRequires: gettext-devel
-BuildRequires: gnome-keyring-devel
-BuildRequires: gnome-panel-devel >= 2.0
-BuildRequires: gtk+2-devel >= 2.0
-BuildRequires: hal-devel >= 0.5.2
-BuildRequires: libgcrypt-devel
-BuildRequires: libglade2-devel >= 2.0
-BuildRequires: libiw-devel >= 1:28
-BuildRequires: libnl-devel >= 1.0
-BuildRequires: libnotify-devel >= 0.3.0
+Source0: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/1.0/network-manager-applet-%{version}.tar.xz
+# Source0-md5: dbdead7c5838e422d4b80565b7657a2a
+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.11
+BuildRequires: dbus-devel >= 1.2.6
+BuildRequires: dbus-glib-devel >= 0.74
+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.50.1
+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: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.268
-Requires(post): /sbin/ldconfig
-Requires(post,preun): /sbin/chkconfig
-Requires: NetworkManager >= 0.6.5
+BuildRequires: rpmbuild(macros) >= 1.592
+BuildRequires: tar >= 1:1.22
+BuildRequires: udev-glib-devel >= 1:147
+BuildRequires: xz
+Requires(post,postun): glib2 >= 1:2.32
+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: hicolor-icon-theme
+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 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: %{name} = %{version}-%{release}
+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 \
+ --disable-static \
+ --enable-more-warnings=yes \
+ %{!?with_gnomebt:--without-bluetooth}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+%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
%clean
rm -rf $RPM_BUILD_ROOT
%post
-%gconf_schema_install
+%update_icon_cache hicolor
+%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 ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_datadir}/nm-applet
+%doc AUTHORS CONTRIBUTING ChangeLog
+%attr(755,root,root) %{_bindir}/nm-applet
+%attr(755,root,root) %{_bindir}/nm-connection-editor
+%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
+%{_datadir}/appdata/org.gnome.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
-%{_sysconfdir}/dbus-1/system.d/*
-%{_datadir}/gnome/autostart/*.desktop
+%{_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
+%{_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