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

diff --git a/NetworkManager-applet.spec b/NetworkManager-applet.spec
index 70876fe..884689c 100644
--- a/NetworkManager-applet.spec
+++ b/NetworkManager-applet.spec
@@ -1,34 +1,56 @@
+#
+# Conditional build:
+%bcond_with	appindicator	# application indicators instead of xembed systray support
+#
+%define		nmversion 2:1.4
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager-applet
-Version:	0.6.5
-Release:	3
+Version:	1.4.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:	autoconf >= 2.52
-BuildRequires:	automake
-BuildRequires:	dbus-glib-devel >= 0.60
-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:	libtool
+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.11
+BuildRequires:	dbus-devel >= 1.2.6
+BuildRequires:	dbus-glib-devel >= 0.74
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.32
+BuildRequires:	gobject-introspection-devel >= 0.9.6
+BuildRequires:	gtk+3-devel >= 3.4
+BuildRequires:	gtk-doc >= 1.0
+BuildRequires:	intltool >= 0.50.1
+BuildRequires:	iso-codes
+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
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.268
-Requires(post):	/sbin/ldconfig
-Requires(post,preun):	/sbin/chkconfig
-Requires(post,postun):	hicolor-icon-theme
-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:	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)
@@ -39,40 +61,129 @@ Network Manager Applet for GNOME.
 %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:	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+ 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.32
+Requires:	gtk+3-devel >= 3.4
+
+%description -n NetworkManager-gtk-lib-devel
+Header files for NetworkManager GTK+ libraries.
+
+%description -n NetworkManager-gtk-lib-devel -l pl.UTF-8
+Pakiet programistyczny bibliotek GTK+ NetworkManagera.
+
+%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 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 nm-applet-%{version}
+%setup -q -n network-manager-applet-%{version}
 
 %build
+%{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--disable-silent-rules \
+	--disable-static \
+	--enable-more-warnings=yes \
+	%{?with_appindicator:--with-appindicator} \
+	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
-	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
+%{__rm}	$RPM_BUILD_ROOT%{_libdir}/{libnm-gtk,libnma}.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
+%{_datadir}/GConf/gsettings/nm-applet.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
+%dir %{_datadir}/gnome-vpn-properties
+%{_datadir}/appdata/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
+%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
+%{_includedir}/libnma
+%{_pkgconfigdir}/libnm-gtk.pc
+%{_pkgconfigdir}/libnma.pc
+
+%files -n NetworkManager-gtk-lib-apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/libnma