- updated to 1.0.6

[packages/NetworkManager-applet.git] / NetworkManager-applet.spec

diff --git a/NetworkManager-applet.spec b/NetworkManager-applet.spec
index b585808824d37f8bf7d47fc80bf13f25f06d1fde..33646d3e1ffede0a40ef02ed5afcff35120a86e7 100644 (file)
--- a/NetworkManager-applet.spec
+++ b/NetworkManager-applet.spec
@@ -1,44 +1,50 @@
-#
 # Conditional build:
-%bcond_without gnomebt         # GNOME-Bluetooth plugin
+%bcond_with    gnomebt         # GNOME-Bluetooth plugin
 #
-%define                nmversion 2:0.9.4.0
+%define                nmversion 2:1.0.0
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager-applet
-Version:       0.9.4.1
-Release:       2
+Version:       1.0.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: a8de4ace4a40e432838e434f0bf71e7a
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/1.0/network-manager-applet-%{version}.tar.xz
+# Source0-md5: dbdead7c5838e422d4b80565b7657a2a
 URL:           http://projects.gnome.org/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.16.0
+BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= 1:2.32
+%{?with_gnomebt:BuildRequires: gnome-bluetooth-devel < 3.11}
 %{?with_gnomebt:BuildRequires: gnome-bluetooth-devel >= 2.28.0}
 BuildRequires: gnome-common
-BuildRequires: gtk+3-devel >= 3.2.0
-BuildRequires: intltool >= 0.40.0
+BuildRequires: gobject-introspection-devel >= 0.9.6
+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.4.3
+BuildRequires: libnotify-devel >= 0.7.0
+BuildRequires: libsecret-devel
 BuildRequires: libtool >= 2:2.2.6
 BuildRequires: pkgconfig
-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.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:      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)
@@ -59,7 +65,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:      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.
@@ -71,10 +79,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:      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.
@@ -108,6 +117,7 @@ Wtyczka NetworkManager Applet dla GNOME Bluetooth.
 %configure \
        --disable-silent-rules \
        --disable-static \
+       --enable-more-warnings=yes \
        %{!?with_gnomebt:--without-bluetooth}
 %{__make}
 
@@ -130,13 +140,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
@@ -146,12 +156,17 @@ 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
+%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
+%{_mandir}/man1/nm-applet.1*
+%{_mandir}/man1/nm-connection-editor.1*
 %{_iconsdir}/hicolor/*/apps/*.png
 %{_iconsdir}/hicolor/*/apps/*.svg
 
@@ -159,12 +174,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnm-gtk.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnm-gtk.so.0
+%{_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
+%{_datadir}/gir-1.0/NMGtk-1.0.gir
 %{_includedir}/libnm-gtk
-%{_libdir}/libnm-gtk.so
 %{_pkgconfigdir}/libnm-gtk.pc
 
 %if %{with gnomebt}