X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=NetworkManager-applet.spec;h=884689c5eb44ae852933c02ebd130bcb4758326f;hb=55ed05f45bf59154315d00c4ad46a3c0ac96876f;hp=6021d46627719061fc5111d03ef52f31289fb010;hpb=aaf04f0a367445a2ce85fad68d21482c3256c8eb;p=packages%2FNetworkManager-applet.git

diff --git a/NetworkManager-applet.spec b/NetworkManager-applet.spec
index 6021d46..884689c 100644
--- a/NetworkManager-applet.spec
+++ b/NetworkManager-applet.spec
@@ -1,36 +1,34 @@
-# TODO
-# - gtk+2 applet possible as well
 #
 # Conditional build:
-%bcond_with	gnomebt		# GNOME-Bluetooth plugin
+%bcond_with	appindicator	# application indicators instead of xembed systray support
 #
-%define		nmversion 2:0.9.8.10
+%define		nmversion 2:1.4
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager-applet
-Version:	0.9.8.10
+Version:	1.4.6
 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:	5148348c139229c6a753f815f3f11e1c
-URL:		http://projects.gnome.org/NetworkManager/
-BuildRequires:	GConf2-devel >= 2.20.0
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/1.4/network-manager-applet-%{version}.tar.xz
+# Source0-md5:	7f5bb421678f844649d8d581def2191e
+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.26.0
-%{?with_gnomebt:BuildRequires:	gnome-bluetooth-devel >= 2.28.0}
-%{?with_gnomebt:BuildRequires:	gnome-bluetooth-devel < 3.11}
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.32
 BuildRequires:	gobject-introspection-devel >= 0.9.6
-BuildRequires:	gtk+3-devel >= 3.2.0
-BuildRequires:	intltool >= 0.40.0
+BuildRequires:	gtk+3-devel >= 3.4
+BuildRequires:	gtk-doc >= 1.0
+BuildRequires:	intltool >= 0.50.1
 BuildRequires:	iso-codes
-BuildRequires:	libgnome-keyring-devel >= 2.20.0
+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
 BuildRequires:	libsecret-devel
 BuildRequires:	libtool >= 2:2.2.6
@@ -39,17 +37,20 @@ 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(post,postun):	hicolor-icon-theme
-Requires(post,preun):	GConf2
 Requires:	NetworkManager >= %{nmversion}
 Requires:	NetworkManager-gtk-lib = %{version}-%{release}
 Requires:	dbus >= 1.2.6
-Requires:	glib2 >= 1:2.26.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)
 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)
@@ -64,10 +65,10 @@ Aplet zarządcy sieci dla GNOME.
 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.26.0
-Requires:	gtk+3 >= 3.0.0
+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.
@@ -76,33 +77,30 @@ GTK+ dialogs library for NetworkManager.
 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-gtk-lib = %{version}-%{release}
-Requires:	GConf2-devel >= 2.20.0
 Requires:	NetworkManager-devel >= %{nmversion}
-Requires:	glib2-devel >= 1:2.26.0
-Requires:	gtk+3-devel >= 3.0.0
+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.
+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 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
+%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
-NetworkManager applet plugin for GNOME Bluetooth.
+%description -n NetworkManager-gtk-lib-apidocs
+API documentation for NMA (NetworkManager Applet) library.
 
-%description -n gnome-bluetooth-plugin-nma -l pl.UTF-8
-Wtyczka NetworkManager Applet dla GNOME Bluetooth.
+%description -n NetworkManager-gtk-lib-apidocs -l pl.UTF-8
+Dokumentacja API biblioteki NMA (NetworkManager Applet).
 
 %prep
 %setup -q -n network-manager-applet-%{version}
@@ -115,11 +113,11 @@ Wtyczka NetworkManager Applet dla GNOME Bluetooth.
 %{__autoheader}
 %{__automake}
 %configure \
-	--with-gtkver=3 \
 	--disable-silent-rules \
 	--disable-static \
 	--enable-more-warnings=yes \
-	%{!?with_gnomebt:--without-bluetooth}
+	%{?with_appindicator:--with-appindicator} \
+	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
 %install
@@ -129,10 +127,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
 
@@ -157,11 +152,10 @@ fi
 %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/nm-connection-editor.appdata.xml
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %{_desktopdir}/nm-applet.desktop
 %{_desktopdir}/nm-connection-editor.desktop
@@ -174,18 +168,22 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnm-gtk.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnm-gtk.so.0
+%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
-%{_datadir}/libnm-gtk
 
 %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
+%{_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