X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=NetworkManager-applet.spec;h=36f8c5333219ed6d7546a41f59b519c85e9b7dbe;hb=HEAD;hp=823ba242804a23018aec7199e0e10e4e2da477f4;hpb=650e19a5c0f34e75f431c56875e1ce0ed3d398ca;p=packages%2FNetworkManager-applet.git

diff --git a/NetworkManager-applet.spec b/NetworkManager-applet.spec
index 823ba24..36f8c53 100644
--- a/NetworkManager-applet.spec
+++ b/NetworkManager-applet.spec
@@ -1,22 +1,20 @@
 #
 # Conditional build:
-%bcond_without	appindicator	# without application indicators
+%bcond_without	appindicator	# application indicators
 #
-%define		nmversion 2:1.8
+%define		nm_ver	2:1.8
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager-applet
-Version:	1.30.0
+Version:	1.36.0
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	https://download.gnome.org/sources/network-manager-applet/1.30/network-manager-applet-%{version}.tar.xz
-# Source0-md5:	1ad82752f1590dd356afda8a451910f2
+Source0:	https://download.gnome.org/sources/network-manager-applet/1.36/network-manager-applet-%{version}.tar.xz
+# Source0-md5:	534f7142f4cfbd81d79eec5e62bc80a8
 URL:		https://wiki.gnome.org/Projects/NetworkManager
 BuildRequires:	ModemManager-devel >= 1.0.0
-BuildRequires:	NetworkManager-devel >= %{nmversion}
-BuildRequires:	dbus-devel >= 1.2.6
-BuildRequires:	dbus-glib-devel >= 0.74
+BuildRequires:	NetworkManager-devel >= %{nm_ver}
 BuildRequires:	gcr-devel >= 3.14
 BuildRequires:	gcr-ui-devel >= 3.14
 BuildRequires:	gettext-tools >= 0.19.8
@@ -35,13 +33,11 @@ BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
-BuildRequires:	udev-glib-devel >= 1:147
 BuildRequires:	xz
+Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	glib2 >= 1:2.40
 Requires(post,postun):	gtk-update-icon-cache
-Requires:	NetworkManager >= %{nmversion}
-Requires:	dbus >= 1.2.6
-Requires:	dbus-glib >= 0.74
+Requires:	NetworkManager >= %{nm_ver}
 Requires:	glib2 >= 1:2.40
 Requires:	hicolor-icon-theme
 Requires:	jansson >= 2.7
@@ -52,6 +48,7 @@ Requires:	polkit-gnome
 Suggests:	dbus(org.freedesktop.Notifications)
 Obsoletes:	NetworkManager-applet-devel < 0.7.0
 Obsoletes:	gnome-bluetooth-plugin-nma < 1.2.2
+Conflicts:	libnma-data < 1.10.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -75,6 +72,8 @@ install -d $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
 
 %ninja_install -C build
 
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ie
+
 %find_lang %{name} --with-gnome --all-name
 
 %clean
@@ -83,12 +82,14 @@ rm -rf $RPM_BUILD_ROOT
 %post
 %update_icon_cache hicolor
 %glib_compile_schemas
+%update_desktop_database_post
 
 %postun
 %update_icon_cache hicolor
 if [ "$1" = "0" ]; then
 	%glib_compile_schemas
 fi
+%update_desktop_database_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -98,6 +99,7 @@ fi
 %{_datadir}/GConf/gsettings/nm-applet.convert
 %dir %{_datadir}/gnome-vpn-properties
 %{_datadir}/metainfo/nm-connection-editor.appdata.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %{_desktopdir}/nm-applet.desktop
 %{_desktopdir}/nm-connection-editor.desktop