|
|
@@ -1,9 +1,9 @@
|
|
|
%define udev_scriptdir /lib/udev
|
|
|
|
|
|
-%define dbus_version 1.2
|
|
|
-%define dbus_glib_version 0.80
|
|
|
+%define dbus_version 1.4.1
|
|
|
+%define dbus_glib_version 0.92
|
|
|
|
|
|
-%define gtk2_version 2.16.0
|
|
|
+%define gtk2_version 2.22.1
|
|
|
%define wireless_tools_version 29
|
|
|
%define libnl_version 1.1
|
|
|
%define ppp_version 2.4.4
|
|
|
@@ -14,8 +14,8 @@
|
|
|
Name: NetworkManager
|
|
|
Summary: Network connection manager and user applications
|
|
|
Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
|
|
|
-Version: 0.8
|
|
|
-Release: 2%{?snapshot}%{?_dist_release}
|
|
|
+Version: 0.8.2
|
|
|
+Release: 1%{?snapshot}%{?_dist_release}
|
|
|
Group: System Environment/Base
|
|
|
License: GPLv2+
|
|
|
URL: http://www.gnome.org/projects/NetworkManager/
|
|
|
@@ -28,6 +28,9 @@ Patch1: nm-applet-internal-buildfixes.patch
|
|
|
Patch2: explain-dns1-dns2.patch
|
|
|
#Patch10: NetworkManager-0.7.1-jp-modem-probe.patch
|
|
|
#Patch11: NetworkManager-0.7.1-emobile.patch
|
|
|
+Patch20: NetworkManager-0.8.2-git20101110.patch
|
|
|
+Patch21: NetworkManager-0.8.2-git20101118-git20101219.patch
|
|
|
+Patch22: network-manager-applet-git20101116.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
@@ -72,6 +75,8 @@ BuildRequires: nss-devel >= 3.11.7
|
|
|
BuildRequires: dhclient
|
|
|
BuildRequires: polkit-devel
|
|
|
BuildRequires: gnome-bluetooth-devel
|
|
|
+BuildRequires: libgudev1-devel
|
|
|
+BuildRequires: iptables-devel
|
|
|
|
|
|
%description
|
|
|
NetworkManager attempts to keep an active network connection available at all
|
|
|
@@ -152,6 +157,11 @@ tar -xzf %{SOURCE1}
|
|
|
%patch2 -p1 -b .explain-dns1-dns2
|
|
|
#%patch10 -p1 -b .phs-modem
|
|
|
#%patch11 -p1 -b .emobile
|
|
|
+%patch20 -p1
|
|
|
+%patch21 -p1
|
|
|
+pushd network-manager-applet-%{version}
|
|
|
+%patch22 -p1
|
|
|
+popd
|
|
|
|
|
|
# update ja.po
|
|
|
cp -f %{SOURCE3} network-manager-applet-%{version}/po/ja.po
|
|
|
@@ -211,6 +221,9 @@ cat nm-applet.lang >> %{name}.lang
|
|
|
|
|
|
install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
|
|
|
|
|
|
+# remove gnome-bluetooth plugins
|
|
|
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/libnma.so
|
|
|
+
|
|
|
%clean
|
|
|
%{__rm} -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
@@ -231,11 +244,31 @@ fi
|
|
|
%post glib -p /sbin/ldconfig
|
|
|
%postun glib -p /sbin/ldconfig
|
|
|
|
|
|
+%pre gnome
|
|
|
+if [ "$1" -gt 1 ]; then
|
|
|
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
|
|
+ if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
|
|
|
+ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
|
|
|
+ fi
|
|
|
+fi
|
|
|
+
|
|
|
+%preun gnome
|
|
|
+if [ "$1" -eq 0 ]; then
|
|
|
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
|
|
+ if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
|
|
|
+ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
|
|
|
+ fi
|
|
|
+fi
|
|
|
+
|
|
|
%post gnome
|
|
|
touch --no-create %{_datadir}/icons/hicolor
|
|
|
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
|
|
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
|
|
|
fi
|
|
|
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
|
|
+if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
|
|
|
+ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
|
|
|
+fi
|
|
|
|
|
|
%postun gnome
|
|
|
touch --no-create %{_datadir}/icons/hicolor
|
|
|
@@ -259,12 +292,14 @@ fi
|
|
|
%config(noreplace) %{_sysconfdir}/%{name}/nm-system-settings.conf
|
|
|
%{_bindir}/nm-tool
|
|
|
%{_bindir}/nm-online
|
|
|
+%{_bindir}/nmcli
|
|
|
%{_libexecdir}/nm-dhcp-client.action
|
|
|
%{_libexecdir}/nm-avahi-autoipd.action
|
|
|
%{_libexecdir}/nm-dispatcher.action
|
|
|
%dir %{_libdir}/NetworkManager
|
|
|
%{_libdir}/NetworkManager/*.so*
|
|
|
%{_mandir}/man1/*
|
|
|
+%{_mandir}/man5/*
|
|
|
%{_mandir}/man8/*
|
|
|
%dir %{_localstatedir}/run/NetworkManager
|
|
|
%dir %{_localstatedir}/lib/NetworkManager
|
|
|
@@ -287,6 +322,7 @@ fi
|
|
|
%files gnome
|
|
|
%defattr(-,root,root,0755)
|
|
|
%{_sysconfdir}/dbus-1/system.d/nm-applet.conf
|
|
|
+%{_sysconfdir}/gconf/schemas/nm-applet.schemas
|
|
|
%{_bindir}/nm-applet
|
|
|
%{_bindir}/nm-connection-editor
|
|
|
%{_datadir}/applications/*.desktop
|
|
|
@@ -298,6 +334,7 @@ fi
|
|
|
%{_datadir}/icons/hicolor/scalable/apps/*.svg
|
|
|
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
|
|
|
%dir %{_datadir}/gnome-vpn-properties
|
|
|
+##%{_libdir}/gnome-bluetooth/plugins/libnma.so
|
|
|
|
|
|
%files glib
|
|
|
%defattr(-,root,root,0755)
|
|
|
@@ -321,6 +358,14 @@ fi
|
|
|
%{_datadir}/gtk-doc/html/libnm-util/*
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Jan 01 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.2-1
|
|
|
+- update to 0.8.2
|
|
|
+- add Patch20 (NetworkManager-0.8.2-git20101110.patch)
|
|
|
+- add Patch21 (NetworkManager-0.8.2-git20101118-git20101219.patch)
|
|
|
+- add Patch22 (network-manager-applet-git20101116.patch)
|
|
|
+- update Patch1,2 from FC package
|
|
|
+- add BuildRequires: libgudev1-devel, iptables-devel
|
|
|
+
|
|
|
* Thu Sep 30 2010 Shu KONNO <owa@bg.wakwak.com> 0.8-2
|
|
|
- rebuilt with rpm-4.8.1 for pkg-config
|
|
|
|
Takemikaduchi