|
@@ -8,28 +8,27 @@
|
|
|
%define libnl_version 1.1
|
|
|
%define ppp_version 2.4.4
|
|
|
|
|
|
+%define applet_version 0.8.4
|
|
|
+
|
|
|
#define snapshot .git20090414
|
|
|
#define applet_snapshot %{nil}
|
|
|
|
|
|
Name: NetworkManager
|
|
|
Summary: Network connection manager and user applications
|
|
|
Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
|
|
|
-Version: 0.8.2
|
|
|
-Release: 2%{?snapshot}%{?_dist_release}
|
|
|
+Version: 0.8.4.0
|
|
|
+Release: 1%{?snapshot}%{?_dist_release}
|
|
|
Group: System Environment/Base
|
|
|
License: GPLv2+
|
|
|
URL: http://www.gnome.org/projects/NetworkManager/
|
|
|
|
|
|
Source: %{name}-%{version}%{?snapshot}.tar.bz2
|
|
|
-Source1: network-manager-applet-%{version}%{?applet_snapshot}.tar.bz2
|
|
|
+Source1: network-manager-applet-%{applet_version}%{?applet_snapshot}.tar.bz2
|
|
|
Source2: nm-system-settings.conf
|
|
|
-Patch1: nm-applet-internal-buildfixes.patch
|
|
|
+Patch1: nm-applet-internal-buildfixes-nm084.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
|
|
|
+Patch20: NetworkManager-0.8.4.0-git20110501.patch
|
|
|
+Patch30: network-manager-applet-0.8.4-git20110503.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
@@ -154,12 +153,9 @@ NetworkManager functionality from applications that use glib.
|
|
|
tar -xzf %{SOURCE1}
|
|
|
%patch1 -p1 -b .nm-applet-internal
|
|
|
%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
|
|
|
+%patch20 -p1 -b .NM-git20110501
|
|
|
+pushd network-manager-applet-%{applet_version}
|
|
|
+%patch30 -p1 -b .nma-git20110501
|
|
|
popd
|
|
|
|
|
|
|
|
@@ -177,7 +173,7 @@ autoreconf -i
|
|
|
make
|
|
|
|
|
|
# build the applet
|
|
|
-pushd network-manager-applet-%{version}
|
|
|
+pushd network-manager-applet-%{applet_version}
|
|
|
autoreconf -i
|
|
|
intltoolize --force
|
|
|
%configure --disable-static
|
|
@@ -193,7 +189,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
|
|
|
|
|
|
# install the applet
|
|
|
-pushd network-manager-applet-%{version}
|
|
|
+pushd network-manager-applet-%{applet_version}
|
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
popd
|
|
|
|
|
@@ -355,6 +351,13 @@ fi
|
|
|
%{_datadir}/gtk-doc/html/libnm-util/*
|
|
|
|
|
|
%changelog
|
|
|
+* Tue May 03 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.4.0-1
|
|
|
+- update to 0.8.4.0
|
|
|
+- update Patch1 (nm-applet-internal-buildfixes-nm084.patch)
|
|
|
+- update Patch20 (NetworkManger-0.8.4.0-git20110501.patch)
|
|
|
+- update Patch30 (network-manager-applet-0.8.4-git20110503.patch)
|
|
|
+- delete Patch21,22
|
|
|
+
|
|
|
* Mon May 2 2011 IWAI, Masaharu <iwai@alib.jp> 0.8.2-2
|
|
|
- drop nm-applet ja.po (Source3)
|
|
|
|