|
|
@@ -2,39 +2,38 @@
|
|
|
|
|
|
%define dbus_version 1.2
|
|
|
%define dbus_glib_version 0.80
|
|
|
-%define hal_version 0.5
|
|
|
|
|
|
%define gtk2_version 2.16.0
|
|
|
%define wireless_tools_version 29
|
|
|
%define libnl_version 1.1
|
|
|
%define ppp_version 2.4.4
|
|
|
|
|
|
-%define snapshot .git20090414
|
|
|
-%define applet_snapshot %{nil}
|
|
|
+#define snapshot .git20090414
|
|
|
+#define applet_snapshot %{nil}
|
|
|
|
|
|
Name: NetworkManager
|
|
|
Summary: Network connection manager and user applications
|
|
|
Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
|
|
|
-Version: 0.7.1
|
|
|
-Release: 4%{snapshot}%{?_dist_release}
|
|
|
+Version: 0.8
|
|
|
+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
|
|
|
+Source: %{name}-%{version}%{?snapshot}.tar.bz2
|
|
|
+Source1: network-manager-applet-%{version}%{?applet_snapshot}.tar.bz2
|
|
|
Source2: nm-system-settings.conf
|
|
|
-Source3: nm-applet-0.7.1-ja.po
|
|
|
+Source3: nm-applet-0.8-ja.po
|
|
|
+Patch1: nm-applet-internal-buildfixes.patch
|
|
|
Patch2: explain-dns1-dns2.patch
|
|
|
-Patch10: NetworkManager-0.7.1-phs-modem-probe.patch
|
|
|
-Patch11: NetworkManager-0.7.1-emobile.patch
|
|
|
+#Patch10: NetworkManager-0.7.1-jp-modem-probe.patch
|
|
|
+#Patch11: NetworkManager-0.7.1-emobile.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
-PreReq: chkconfig
|
|
|
-Requires: dbus
|
|
|
-Requires: dbus-glib
|
|
|
-Requires: hal
|
|
|
+Requires(post): chkconfig
|
|
|
+Requires(preun): chkconfig
|
|
|
+
|
|
|
Requires: iproute openssl
|
|
|
Requires: dhclient
|
|
|
Requires: wpa_supplicant
|
|
|
@@ -43,15 +42,16 @@ Requires: %{name}-glib = %{version}-%{release}
|
|
|
Requires: ppp
|
|
|
Requires: avahi
|
|
|
Requires: dnsmasq
|
|
|
-Requires: PolicyKit-gnome
|
|
|
Requires: initscripts >= 8.80.0
|
|
|
+Requires: udev
|
|
|
+Requires: ModemManager
|
|
|
+Requires: mobile-broadband-provider-info
|
|
|
Obsoletes: dhcdbd
|
|
|
Conflicts: %{name}-openvpn < 0.7.0.99
|
|
|
|
|
|
BuildRequires: dbus-devel >= %{dbus_version}
|
|
|
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
|
|
|
BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
|
|
|
-BuildRequires: hal-devel >= %{hal_version}
|
|
|
BuildRequires: glib2-devel gtk2-devel
|
|
|
BuildRequires: libglade2-devel
|
|
|
BuildRequires: openssl-devel
|
|
|
@@ -66,10 +66,12 @@ BuildRequires: libnl-devel >= %{libnl_version}
|
|
|
BuildRequires: libnotify-devel >= 0.3
|
|
|
BuildRequires: perl(XML::Parser)
|
|
|
BuildRequires: automake autoconf intltool libtool
|
|
|
-#BuildRequires: ppp-devel >= %{ppp_version}
|
|
|
+BuildRequires: ppp-devel >= %{ppp_version}
|
|
|
+BuildRequires: libuuid-devel
|
|
|
BuildRequires: nss-devel >= 3.11.7
|
|
|
-BuildRequires: PolicyKit-devel PolicyKit-gnome-devel
|
|
|
BuildRequires: dhclient
|
|
|
+BuildRequires: polkit-devel
|
|
|
+BuildRequires: gnome-bluetooth-devel
|
|
|
|
|
|
%description
|
|
|
NetworkManager attempts to keep an active network connection available at all
|
|
|
@@ -104,7 +106,7 @@ Requires: gnome-panel
|
|
|
Requires: dbus
|
|
|
Requires: dbus-glib
|
|
|
Requires: libnotify
|
|
|
-PreReq: gtk2 >= %{gtk2_version}
|
|
|
+Requires(post): gtk2 >= %{gtk2_version}
|
|
|
Requires: gnome-keyring
|
|
|
Requires: nss
|
|
|
Requires: gnome-icon-theme
|
|
|
@@ -146,9 +148,10 @@ NetworkManager functionality from applications that use glib.
|
|
|
|
|
|
# unpack the applet
|
|
|
tar -xzf %{SOURCE1}
|
|
|
+%patch1 -p1 -b .nm-applet-internal
|
|
|
%patch2 -p1 -b .explain-dns1-dns2
|
|
|
-%patch10 -p1 -b .phs-modem
|
|
|
-%patch11 -p1 -b .emobile
|
|
|
+#%patch10 -p1 -b .phs-modem
|
|
|
+#%patch11 -p1 -b .emobile
|
|
|
|
|
|
# update ja.po
|
|
|
cp -f %{SOURCE3} network-manager-applet-%{version}/po/ja.po
|
|
|
@@ -158,10 +161,12 @@ autoreconf -i
|
|
|
%configure \
|
|
|
--disable-static \
|
|
|
--with-distro=redhat \
|
|
|
- --with-dhcp-client=dhclient \
|
|
|
+ --with-dhclient=yes \
|
|
|
+ --with-dhcpcd=no \
|
|
|
--with-crypto=nss \
|
|
|
--with-docs=yes \
|
|
|
- --enable-more-warnings=yes
|
|
|
+ --enable-more-warnings=yes \
|
|
|
+ --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version}
|
|
|
make
|
|
|
|
|
|
# build the applet
|
|
|
@@ -193,17 +198,19 @@ popd
|
|
|
|
|
|
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
|
|
|
|
|
|
+%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/NetworkManager
|
|
|
+
|
|
|
%find_lang %{name}
|
|
|
%find_lang nm-applet
|
|
|
cat nm-applet.lang >> %{name}.lang
|
|
|
|
|
|
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
|
|
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.4.4/*.la
|
|
|
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/pppd/*/*.la
|
|
|
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la
|
|
|
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.la
|
|
|
|
|
|
install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
|
|
|
|
|
|
-
|
|
|
%clean
|
|
|
%{__rm} -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
@@ -238,19 +245,18 @@ fi
|
|
|
|
|
|
%files -f %{name}.lang
|
|
|
%defattr(-,root,root,0755)
|
|
|
-%doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO
|
|
|
+%doc COPYING NEWS AUTHORS README CONTRIBUTING TODO
|
|
|
%{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
|
|
|
%{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
|
|
|
%{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf
|
|
|
%{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf
|
|
|
-%{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf
|
|
|
+%{_sysconfdir}/dbus-1/system.d/nm-ifcfg-rh.conf
|
|
|
%config %{_sysconfdir}/rc.d/init.d/NetworkManager
|
|
|
%{_sbindir}/%{name}
|
|
|
-%{_sbindir}/nm-system-settings
|
|
|
%dir %{_sysconfdir}/%{name}/
|
|
|
%dir %{_sysconfdir}/%{name}/dispatcher.d
|
|
|
%dir %{_sysconfdir}/%{name}/VPN
|
|
|
-%{_sysconfdir}/%{name}/nm-system-settings.conf
|
|
|
+%config(noreplace) %{_sysconfdir}/%{name}/nm-system-settings.conf
|
|
|
%{_bindir}/nm-tool
|
|
|
%{_bindir}/nm-online
|
|
|
%{_libexecdir}/nm-dhcp-client.action
|
|
|
@@ -261,15 +267,15 @@ fi
|
|
|
%{_mandir}/man1/*
|
|
|
%{_mandir}/man8/*
|
|
|
%dir %{_localstatedir}/run/NetworkManager
|
|
|
+%dir %{_localstatedir}/lib/NetworkManager
|
|
|
%{_prefix}/libexec/nm-crash-logger
|
|
|
%dir %{_datadir}/NetworkManager
|
|
|
%{_datadir}/NetworkManager/gdb-cmd
|
|
|
-%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service
|
|
|
+%dir %{_sysconfdir}/NetworkManager/system-connections
|
|
|
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
|
|
|
-%{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
|
|
|
-%{_datadir}/PolicyKit/policy/*.policy
|
|
|
-%{udev_scriptdir}/nm-modem-probe
|
|
|
-%{udev_scriptdir}/rules.d/77-nm-probe-modem-capabilities.rules
|
|
|
+%{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
|
|
|
+%{_datadir}/polkit-1/actions/*.policy
|
|
|
+%{udev_scriptdir}/rules.d/*.rules
|
|
|
|
|
|
%files devel
|
|
|
%defattr(-,root,root,0755)
|
|
|
@@ -295,18 +301,19 @@ fi
|
|
|
|
|
|
%files glib
|
|
|
%defattr(-,root,root,0755)
|
|
|
-%{_libdir}/libnm_glib.so.*
|
|
|
-%{_libdir}/libnm_glib_vpn.so.*
|
|
|
+%{_libdir}/libnm-glib.so.*
|
|
|
+%{_libdir}/libnm-glib-vpn.so.*
|
|
|
%{_libdir}/libnm-util.so.*
|
|
|
|
|
|
%files glib-devel
|
|
|
+%dir %{_includedir}/libnm-glib/
|
|
|
%{_includedir}/libnm-glib/*.h
|
|
|
%{_includedir}/NetworkManager/nm-*.h
|
|
|
-%{_libdir}/pkgconfig/libnm_glib.pc
|
|
|
-%{_libdir}/pkgconfig/libnm_glib_vpn.pc
|
|
|
+%{_libdir}/pkgconfig/libnm-glib.pc
|
|
|
+%{_libdir}/pkgconfig/libnm-glib-vpn.pc
|
|
|
%{_libdir}/pkgconfig/libnm-util.pc
|
|
|
-%{_libdir}/libnm_glib.so
|
|
|
-%{_libdir}/libnm_glib_vpn.so
|
|
|
+%{_libdir}/libnm-glib.so
|
|
|
+%{_libdir}/libnm-glib-vpn.so
|
|
|
%{_libdir}/libnm-util.so
|
|
|
%dir %{_datadir}/gtk-doc/html/libnm-glib
|
|
|
%{_datadir}/gtk-doc/html/libnm-glib/*
|
|
|
@@ -314,6 +321,15 @@ fi
|
|
|
%{_datadir}/gtk-doc/html/libnm-util/*
|
|
|
|
|
|
%changelog
|
|
|
+* Thu May 06 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8-1
|
|
|
+- update to 0.8 release
|
|
|
+- add BR: polkit-devel, gnome-bluetooth-devel
|
|
|
+- remove BR: hal-devel
|
|
|
+- add R: ModemManager, mobile-broadband-provider-info
|
|
|
+
|
|
|
+* Sat Feb 13 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.7.1-5.git20090414
|
|
|
+- update patch10,11 to support another emobile card (D02NE)
|
|
|
+
|
|
|
* Fri Aug 21 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.7.1-4.git20090414
|
|
|
- add Patch11 to support emobile (D02HW,D22HW)
|
|
|
|
daisuke