Author: glen Date: Mon Aug 16 15:36:43 2010 GMT Module: packages Tag: HEAD ---- Log message: - changes from Przemo Firszt <przemo#firszt.eu> (untested): - Add ifcfg-rh plugin to NetworkManager, - Add new config file for NM and remove obsolete one, - Add Suggests: ModemManager & mobile-broadband-provider-info
---- Files affected: packages/NetworkManager: NetworkManager.spec (1.67 -> 1.68) , NetworkManager-plugins-Makefile.patch (NONE -> 1.1) (NEW), NetworkManager.conf (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/NetworkManager/NetworkManager.spec diff -u packages/NetworkManager/NetworkManager.spec:1.67 packages/NetworkManager/NetworkManager.spec:1.68 --- packages/NetworkManager/NetworkManager.spec:1.67 Thu Jul 29 18:32:37 2010 +++ packages/NetworkManager/NetworkManager.spec Mon Aug 16 17:36:38 2010 @@ -1,18 +1,17 @@ # $Revision$, $Date$ -# %define ppp_version 2.4.5 -# Summary: Network Manager for GNOME 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 +39,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 +108,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__intltoolize} @@ -118,7 +120,8 @@ %configure \ --with-html-dir=%{_gtkdocdir} \ --with-distro=pld \ - --with-dhcp-client=/sbin/dhclient \ + --enable-more-warnings=yes \ + --with-dhclient=/sbin/dhclient \ --with-iptables=/usr/sbin/iptables \ --with-system-ca-path=/etc/certs \ --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} @@ -127,12 +130,12 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{_sysconfdir}/%{name}/{VPN,dispatcher.d}} +install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{_sysconfdir}/%{name}/{VPN,dispatcher.d,system-connections}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/nm-system-settings.conf +cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name} # Cleanup rm -f $RPM_BUILD_ROOT%{_libexecdir}/*.{a,la} @@ -173,13 +176,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 +191,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 @@ -236,6 +241,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.68 2010/08/16 15:36:38 glen +- changes from Przemo Firszt <przemo#firszt.eu> (untested): + - Add ifcfg-rh plugin to NetworkManager, + - Add new config file for NM and remove obsolete one, + - Add Suggests: ModemManager & mobile-broadband-provider-info + Revision 1.67 2010/07/29 16:32:37 megabajt - merged from DEVEL ================================================================ Index: packages/NetworkManager/NetworkManager-plugins-Makefile.patch diff -u /dev/null packages/NetworkManager/NetworkManager-plugins-Makefile.patch:1.1 --- /dev/null Mon Aug 16 17:36:43 2010 +++ packages/NetworkManager/NetworkManager-plugins-Makefile.patch Mon Aug 16 17:36:38 2010 @@ -0,0 +1,12 @@ +--- 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 ================================================================ Index: packages/NetworkManager/NetworkManager.conf diff -u /dev/null packages/NetworkManager/NetworkManager.conf:1.1 --- /dev/null Mon Aug 16 17:36:43 2010 +++ packages/NetworkManager/NetworkManager.conf Mon Aug 16 17:36:38 2010 @@ -0,0 +1,2 @@ +[main] +plugins=ifcfg-rh,keyfile ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager.spec?r1=1.67&r2=1.68&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
