X-Git-Url: https://git.pld-linux.org/?p=packages%2FNetworkManager-applet.git;a=blobdiff_plain;f=NetworkManager-applet.spec;h=8318f6790c73b09e0f128d3308dd543220d7ceea;hp=6c4a5fdb153778ff0bc9e299db911f80ff243c75;hb=67c648144cd968667e7eb5a3a6ab836c0c7b54e1;hpb=bc40000dcc9892d433c23aa44a12a9c187232066 diff --git a/NetworkManager-applet.spec b/NetworkManager-applet.spec index 6c4a5fd..8318f67 100644 --- a/NetworkManager-applet.spec +++ b/NetworkManager-applet.spec @@ -1,37 +1,46 @@ -%define nmversion %{version} +# +# Conditional build: +%bcond_without gnomebt # GNOME-Bluetooth plugin +# +%define nmversion 2:0.9.6.0 Summary: Network Manager for GNOME Summary(pl.UTF-8): Zarządca sieci dla GNOME Name: NetworkManager-applet -Version: 0.8 +Version: 0.9.6.4 Release: 1 License: GPL v2 Group: X11/Applications -Source0: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.8/network-manager-applet-%{version}.tar.bz2 -# Source0-md5: 27071402152a7f8f62c4825f25ca9a3a +Source0: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.9/network-manager-applet-%{version}.tar.xz +# Source0-md5: 8750d83a1151f5f9b0edd2ffcd4e8fc6 URL: http://projects.gnome.org/NetworkManager/ BuildRequires: GConf2-devel >= 2.20.0 BuildRequires: NetworkManager-devel >= %{nmversion} -BuildRequires: autoconf >= 2.52 -BuildRequires: automake +BuildRequires: autoconf >= 2.63 +BuildRequires: automake >= 1:1.10 BuildRequires: dbus-devel >= 1.2.6 BuildRequires: dbus-glib-devel >= 0.74 BuildRequires: gettext-devel -BuildRequires: gnome-bluetooth-devel >= 2.28.0 -BuildRequires: gtk+2-devel >= 2:2.14.0 -BuildRequires: intltool >= 0.36.2 -BuildRequires: libglade2-devel +BuildRequires: glib2-devel >= 1:2.26.0 +%{?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: iso-codes BuildRequires: libgnome-keyring-devel >= 2.20.0 -BuildRequires: libiw-devel >= 1:28-0.pre9.1 BuildRequires: libnotify-devel >= 0.4.3 -BuildRequires: libtool +BuildRequires: libtool >= 2:2.2.6 BuildRequires: pkgconfig -BuildRequires: polkit-devel >= 0.92 -BuildRequires: rpmbuild(macros) >= 1.311 -Requires(post,postun): gtk+2 +BuildRequires: rpmbuild(macros) >= 1.592 +BuildRequires: tar >= 1:1.22 +BuildRequires: xz +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: mobile-broadband-provider-info Requires: polkit-gnome Suggests: dbus(org.freedesktop.Notifications) Obsoletes: NetworkManager-applet-devel @@ -45,11 +54,42 @@ 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: GConf2-libs >= 2.20.0 +Requires: NetworkManager-libs >= %{nmversion} +Requires: glib2 >= 1:2.26.0 +Requires: gtk+3 >= 3.0.0 + +%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-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 + +%description -n NetworkManager-gtk-lib-devel +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: NetworkManager-applet >= %{nmversion} +Requires: %{name} = %{version}-%{release} Requires: gnome-bluetooth >= 2.28.0 %description -n gnome-bluetooth-plugin-nma @@ -68,7 +108,11 @@ Wtyczka NetworkManager Applet dla GNOME Bluetooth. %{__autoconf} %{__autoheader} %{__automake} -%configure +%configure \ + --disable-silent-rules \ + --disable-static \ + --enable-more-warnings=yes \ + %{!?with_gnomebt:--without-bluetooth} %{__make} %install @@ -78,7 +122,10 @@ install -d $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.{a,la} +%if %{with gnomebt} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.la +%endif +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnm-gtk.la %find_lang %{name} --with-gnome --all-name @@ -87,28 +134,47 @@ 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 %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS CONTRIBUTING ChangeLog NEWS README +%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 %{_sysconfdir}/xdg/autostart/nm-applet.desktop +%{_desktopdir}/nm-applet.desktop %{_desktopdir}/nm-connection-editor.desktop %{_iconsdir}/hicolor/*/apps/*.png %{_iconsdir}/hicolor/*/apps/*.svg -%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-applet.conf +%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 +%{_datadir}/libnm-gtk + +%files -n NetworkManager-gtk-lib-devel +%defattr(644,root,root,755) +%{_includedir}/libnm-gtk +%{_libdir}/libnm-gtk.so +%{_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