X-Git-Url: https://git.pld-linux.org/?p=packages%2FNetworkManager-applet.git;a=blobdiff_plain;f=NetworkManager-applet.spec;h=e4c87a2791552a0216be443aaf47ad79e2f61638;hp=ad73873da146ca6005377aed8ee4168b67e41642;hb=f4c03efbc8f86b66f863f2aba5053bfe3affddf5;hpb=bbb3912b12fb9d848b164778828b70d202886f13

diff --git a/NetworkManager-applet.spec b/NetworkManager-applet.spec
index ad73873..e4c87a2 100644
--- a/NetworkManager-applet.spec
+++ b/NetworkManager-applet.spec
@@ -1,50 +1,60 @@
 #
 # Conditional build:
-%bcond_without	gnomebt		# GNOME-Bluetooth plugin
+%bcond_with	appindicator	# application indicators instead of xembed systray support
 #
-%define		nmversion 2:%{version}
+%define		nmversion 2:1.8
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager-applet
-Version:	0.9.2.0
+Version:	1.8.18
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.9/network-manager-applet-%{version}.tar.xz
-# Source0-md5:	9623aeb6c782a8d782500cf12c887b5b
-URL:		http://projects.gnome.org/NetworkManager/
-BuildRequires:	GConf2-devel >= 2.20.0
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/1.8/network-manager-applet-%{version}.tar.xz
+# Source0-md5:	34923579b39360db64649342ee6735d8
+URL:		https://wiki.gnome.org/Projects/NetworkManager
+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:	glib2-devel >= 1:2.16.0
-%{?with_gnomebt:BuildRequires:	gnome-bluetooth-devel >= 2.28.0}
-BuildRequires:	gnome-common
-BuildRequires:	gtk+3-devel >= 3.0.0
-BuildRequires:	intltool >= 0.40.0
+BuildRequires:	gcr-devel >= 3.14
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.38
+BuildRequires:	gobject-introspection-devel >= 0.9.6
+BuildRequires:	gtk+3-devel >= 3.10
+BuildRequires:	gtk-doc >= 1.0
+BuildRequires:	intltool >= 0.50.1
 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:	jansson-devel >= 2.7
+%{?with_appindicator:BuildRequires:	libappindicator-gtk3-devel >= 0.1}
+%{?with_appindicator:BuildRequires:	libdbusmenu-gtk3-devel >= 16.04.0}
+BuildRequires:	libnotify-devel >= 0.7.0
+BuildRequires:	libsecret-devel >= 0.18
+BuildRequires:	libselinux-devel
 BuildRequires:	libtool >= 2:2.2.6
+BuildRequires:	mobile-broadband-provider-info-devel
 BuildRequires:	pkgconfig
-BuildRequires:	polkit-devel >= 0.92
-BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	rpmbuild(macros) >= 1.592
 BuildRequires:	tar >= 1:1.22
+BuildRequires:	udev-glib-devel >= 1:147
 BuildRequires:	xz
+Requires(post,postun):	glib2 >= 1:2.38
 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.38
+Requires:	hicolor-icon-theme
+Requires:	jansson >= 2.7
+Requires:	libsecret >= 0.18
 Requires:	mobile-broadband-provider-info
 Requires:	polkit-gnome
 Suggests:	dbus(org.freedesktop.Notifications)
 Obsoletes:	NetworkManager-applet-devel
+Obsoletes:	gnome-bluetooth-plugin-nma < 1.2.2
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -56,32 +66,46 @@ Network Manager Applet for GNOME.
 Aplet zarządcy sieci dla GNOME.
 
 %package -n NetworkManager-gtk-lib
-Summary:	GTK+ dialogs for NetworkManager
+Summary:	GTK+ dialogs library for NetworkManager
+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.38
+Requires:	gtk+3 >= 3.10
+Requires:	udev-glib >= 1:147
 
 %description -n NetworkManager-gtk-lib
-GTK+ dialogs for NetworkManager
+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:	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:	glib2-devel >= 1:2.38
+Requires:	gtk+3-devel >= 3.10
 
 %description -n NetworkManager-gtk-lib-devel
-Header files and libraries for NetworkManager-gtk-lib.
+Header files for NetworkManager GTK+ libraries.
 
-%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 NetworkManager-gtk-lib-devel -l pl.UTF-8
+Pakiet programistyczny bibliotek GTK+ NetworkManagera.
 
-%description -n gnome-bluetooth-plugin-nma
-NetworkManager applet plugin for GNOME Bluetooth.
+%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 gnome-bluetooth-plugin-nma -l pl.UTF-8
-Wtyczka NetworkManager Applet dla GNOME Bluetooth.
+%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}
@@ -96,7 +120,9 @@ Wtyczka NetworkManager Applet dla GNOME Bluetooth.
 %configure \
 	--disable-silent-rules \
 	--disable-static \
-	%{!?with_gnomebt:--without-bluetooth}
+	--enable-more-warnings=yes \
+	%{?with_appindicator:--with-appindicator} \
+	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
 %install
@@ -106,10 +132,7 @@ 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
+%{__rm}	$RPM_BUILD_ROOT%{_libdir}/{libnm-gtk,libnma}.la
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -118,13 +141,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -134,29 +157,38 @@ rm -rf $RPM_BUILD_ROOT
 %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
+%{_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}/metainfo/nm-connection-editor.appdata.xml
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %{_desktopdir}/nm-applet.desktop
 %{_desktopdir}/nm-connection-editor.desktop
-%{_iconsdir}/hicolor/*/apps/*.png
-%{_iconsdir}/hicolor/*/apps/*.svg
+%{_mandir}/man1/nm-applet.1*
+%{_mandir}/man1/nm-connection-editor.1*
+%{_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) %{_libdir}/libnm-gtk.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnm-gtk.so.0
-%{_datadir}/libnm-gtk
+%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
 
 %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
-%{_libdir}/libnm-gtk.so
+%{_includedir}/libnma
 %{_pkgconfigdir}/libnm-gtk.pc
+%{_pkgconfigdir}/libnma.pc
 
-%if %{with gnomebt}
-%files -n gnome-bluetooth-plugin-nma
+%files -n NetworkManager-gtk-lib-apidocs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gnome-bluetooth/plugins/libnma.so
-%endif
+%{_gtkdocdir}/libnma