X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=NetworkManager-applet.spec;h=bf7c37d613c6be46b5a59b8a1f6a51e6223e5a8c;hb=8b20b92fb0aa8607c02ae8f9fa949a1224448c71;hp=644cf7d1e47c8e36a21fd308388c45b181157b74;hpb=022e95d0a6ad0e4d11a63cab1f042b8b1769672f;p=packages%2FNetworkManager-applet.git

diff --git a/NetworkManager-applet.spec b/NetworkManager-applet.spec
index 644cf7d..bf7c37d 100644
--- a/NetworkManager-applet.spec
+++ b/NetworkManager-applet.spec
@@ -1,54 +1,50 @@
-# TODO
-# - gtk+2 applet possible as well
-
-# Conditional build:
-%bcond_without	gnomebt		# GNOME-Bluetooth plugin
-#
-%define		nmversion 2:0.9.8.2
+%define		nmversion 2:1.2.0
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager-applet
-Version:	0.9.8.2
-Release:	2
+Version:	1.2.2
+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:	1dbece6519f32aa43a746abd96181aa0
-URL:		http://projects.gnome.org/NetworkManager/
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/1.2/network-manager-applet-%{version}.tar.xz
+# Source0-md5:	54b29dff37348fce09a567907688e172
+URL:		https://wiki.gnome.org/Projects/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.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}
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.32
 BuildRequires:	gnome-common
 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:	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.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:	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)
@@ -65,8 +61,9 @@ 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.
@@ -78,11 +75,11 @@ Biblioteka okien dialogowych GTK+ dla NetworkManagera.
 Summary:	Development package for NetworkManager-gtk-lib
 Summary(pl.UTF-8):	Pakiet programistyczny dla NetworkManager-gtk-lib
 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.
@@ -90,19 +87,6 @@ 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 network-manager-applet-%{version}
 
@@ -114,11 +98,9 @@ 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}
+	--enable-more-warnings=yes
 %{__make}
 
 %install
@@ -128,10 +110,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
 
@@ -156,11 +135,11 @@ 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/org.gnome.nm-connection-editor.appdata.xml
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %{_desktopdir}/nm-applet.desktop
 %{_desktopdir}/nm-connection-editor.desktop
@@ -173,18 +152,20 @@ 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
+%{_datadir}/libnma
 
 %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
-
-%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
+%{_pkgconfigdir}/libnma.pc
\ No newline at end of file