List of changes:
- Add polkit option to ModemManager configure,
- Add ifcfg-rh plugin to NetworkManager,
- Add new config file for NM and remove obsolete one,
- Add Suggests: ModemManager & mobile-broadband-provider-info to
NetworkManager.spec
Tested on intel 2200 wifi connection and O2 Ireland 3G/UMTS connection
on Nokia 5230 and an USB cable. NetworkManager needs more testing, but
seems to work fine.
And, as always,any volunteers to test & add changes to PLD repo?
--
Regards,
Przemo Firszt
--- NetworkManager-0.8.1/system-settings/plugins/Makefile.am.orig 2010-08-09 19:29:46.202572710 +0100
+++ NetworkManager-0.8.1/system-settings/plugins/Makefile.am 2010-08-09 19:29:19.708303190 +0100
@@ -1,5 +1,9 @@
SUBDIRS=keyfile
+if TARGET_PLD
+SUBDIRS+=ifcfg-rh
+endif
+
if TARGET_REDHAT
SUBDIRS+=ifcfg-rh
endif
[main]
plugins=ifcfg-rh,keyfile
--- ModemManager.spec 2010-08-10 13:42:09.315121691 +0100
+++ ModemManager.spec.new 2010-08-10 13:02:14.394460496 +0100
@@ -37,7 +37,9 @@
%{__autoheader}
%{__automake}
%configure \
- --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version}
+ --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
+ --with-polkit \
+ --enable-more-warnings=yes
%{__make}
%install
--- NetworkManager.spec 2010-08-10 13:43:08.471181923 +0100
+++ NetworkManager.spec.new 2010-08-10 12:47:18.934100569 +0100
@@ -6,13 +6,14 @@
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager
Version: 0.8.1
-Release: 1
+Release: 2
License: GPL v2
Group: Networking/Admin
Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.8/%{name}-%{version}.tar.bz2
# Source0-md5: 96e551149dda8f6e0a5621f77468ba79
-Source1: %{name}-system-settings.conf
+Source1: %{name}.conf
Patch0: %{name}-pld.patch
+Patch1: %{name}-plugins-Makefile.patch
URL: http://projects.gnome.org/NetworkManager/
BuildRequires: autoconf >= 2.52
BuildRequires: automake >= 1:1.9
@@ -40,6 +41,8 @@
Requires: polkit
Requires: rc-scripts
Requires: wpa_supplicant >= 0.6-2
+Suggests: ModemManager
+Suggests: mobile-broadband-provider-info
Obsoletes: dhcdbd < 3.0-1
# s...@latn vs. s...@latin
Conflicts: glibc-misc < 6:2.7
@@ -107,6 +110,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__intltoolize}
@@ -118,8 +122,9 @@
%configure \
--with-html-dir=%{_gtkdocdir} \
--with-distro=pld \
- --with-dhcp-client=/sbin/dhclient \
- --with-iptables=/usr/sbin/iptables \
+ --enable-more-warnings=yes \
+ --with-dhclient=/sbin/dhclient \
+--with-iptables=%{_sbindir}/iptables \
--with-system-ca-path=/etc/certs \
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version}
@@ -129,11 +134,11 @@
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{_sysconfdir}/%{name}/{VPN,dispatcher.d}}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/system-connections
+%{__cp} %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/nm-system-settings.conf
-
# Cleanup
rm -f $RPM_BUILD_ROOT%{_libexecdir}/*.{a,la}
rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/*.*.*/*.{a,la}
@@ -173,13 +178,14 @@
%attr(755,root,root) %{_libexecdir}/nm-dhcp-client.action
%attr(755,root,root) %{_libexecdir}/nm-dispatcher.action
%attr(755,root,root) %{_libexecdir}/libnm-settings-plugin-keyfile.so
+%attr(755,root,root) %{_libexecdir}/libnm-settings-plugin-ifcfg-rh.so
%attr(754,root,root) /etc/rc.d/init.d/NetworkManager
/lib/udev/rules.d/77-nm-olpc-mesh.rules
-%dir %{_sysconfdir}/NetworkManager
-%dir %{_sysconfdir}/NetworkManager/VPN
-%dir %{_sysconfdir}/NetworkManager/dispatcher.d
-%dir %{_sysconfdir}/NetworkManager/system-connections
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/NetworkManager/nm-system-settings.conf
+%dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/VPN
+%dir %{_sysconfdir}/%{name}/dispatcher.d
+%dir %{_sysconfdir}/%{name}/system-connections
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf
%dir %{_datadir}/%{name}
%dir /var/run/%{name}
%{_datadir}/polkit-1/actions/org.freedesktop.network-manager-settings.system.policy
@@ -187,12 +193,13 @@
%{_datadir}/%{name}/gdb-cmd
%{_mandir}/man1/nm-tool.1*
%{_mandir}/man1/nmcli.1*
-%{_mandir}/man5/NetworkManager.conf.5*
%{_mandir}/man5/nm-system-settings.conf.5*
+%{_mandir}/man5/NetworkManager.conf.5*
%{_mandir}/man8/NetworkManager.8*
%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dhcp-client.conf
%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-avahi-autoipd.conf
%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dispatcher.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-ifcfg-rh.conf
%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/NetworkManager.conf
%files apidocs
_______________________________________________
pld-devel-en mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-en
