Author: qwiat Date: Fri Feb 5 23:15:13 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- update to 0.7.999
---- Files affected:
packages/NetworkManager:
NetworkManager-pld.patch (1.11 -> 1.12) , NetworkManager.spec (1.60 -> 1.61)
---- Diffs:
================================================================
Index: packages/NetworkManager/NetworkManager-pld.patch
diff -u packages/NetworkManager/NetworkManager-pld.patch:1.11
packages/NetworkManager/NetworkManager-pld.patch:1.12
--- packages/NetworkManager/NetworkManager-pld.patch:1.11 Fri Nov 27
23:39:28 2009
+++ packages/NetworkManager/NetworkManager-pld.patch Sat Feb 6 00:15:08 2010
@@ -5,32 +5,36 @@
dnl
AC_C_BIGENDIAN
--AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux
distribution to target: One of redhat, suse, gentoo, debian, arch, slackware,
paldo or mandriva]))
-+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux
distribution to target: One of redhat, suse, gentoo, debian, arch, slackware,
paldo, mandriva or pld]))
+-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux
distribution to target: One of redhat, suse, gentoo, debian, arch, slackware,
paldo, mandriva or pardus]))
++AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux
distribution to target: One of redhat, suse, gentoo, debian, arch, slackware,
paldo, mandriva, pardus or pld]))
if test "z$with_distro" = "z"; then
AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
-@@ -94,6 +94,7 @@
- AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
- AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware")
- AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva")
-+ AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
- if test "z$with_distro" = "z"; then
- with_distro=`lsb_release -is`
- fi
@@ -105,7 +106,7 @@
exit 1
else
case $with_distro in
--
redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva) ;;
-+
redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pld) ;;
+-
redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus) ;;
++
redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|pld)
;;
*)
echo "Your distribution (${with_distro}) is not yet
supported! (patches welcome)"
exit 1
-@@ -158,6 +159,11 @@
- AC_DEFINE(TARGET_MANDRIVA, 1, [Define if you have Mandriva])
+@@ -164,6 +165,11 @@
+ AC_DEFINE(TARGET_PARDUS, 1, [Define if you have Pardus])
fi
++AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
++if test x"$with_distro" = xpld; then
++ AC_DEFINE(TARGET_PLD, 1, [Define if you have PLD])
++fi
++
+ AC_MSG_CHECKING([Linux Wireless Extensions >= 18])
+ AC_TRY_COMPILE([#ifndef __user
+ #define __user
+@@ -164,6 +165,11 @@
+ AC_DEFINE(TARGET_PARDUS, 1, [Define if you have Pardus])
+ fi
+
+AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
+if test x"$with_distro" = xpld; then
+ AC_DEFINE(TARGET_PLD, 1, [Define if you have PLD])
================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.60
packages/NetworkManager/NetworkManager.spec:1.61
--- packages/NetworkManager/NetworkManager.spec:1.60 Fri Nov 27 23:39:09 2009
+++ packages/NetworkManager/NetworkManager.spec Sat Feb 6 00:15:08 2010
@@ -2,12 +2,12 @@
Summary: Network Manager for GNOME
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager
-Version: 0.7.2
+Version: 0.7.999
Release: 1
License: GPL v2
Group: Networking/Admin
Source0:
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.7/%{name}-%{version}.tar.bz2
-# Source0-md5: 8e4e69b2836d4849771d905cb9f16138
+# Source0-md5: 581cf6ea9ef358df874359cc8cb9af69
Source1: %{name}-system-settings.conf
Patch0: %{name}-pld.patch
URL: http://projects.gnome.org/NetworkManager/
@@ -20,6 +20,7 @@
BuildRequires: gtk-doc-automake
BuildRequires: hal-devel >= 0.5.2
BuildRequires: intltool >= 0.35.5
+BuildRequires: iptables
BuildRequires: libiw-devel >= 1:28-0.pre9.1
BuildRequires: libnl-devel >= 1:1.0-0.pre8.1
BuildRequires: libtool
@@ -30,6 +31,7 @@
BuildRequires: rpmbuild(macros) >= 1.450
BuildRequires: sed >= 4.0
BuildRequires: udev-devel
+BuildRequires: udev-glib-devel
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-libs = %{version}-%{release}
Requires: PolicyKit
@@ -157,7 +159,6 @@
%doc AUTHORS ChangeLog NEWS README TODO
%attr(755,root,root) %{_bindir}/nm-tool
%attr(755,root,root) %{_sbindir}/NetworkManager
-%attr(755,root,root) %{_sbindir}/nm-system-settings
%dir %{_libdir}/NetworkManager
%attr(755,root,root) %{_libexecdir}/nm-crash-logger
%attr(755,root,root) %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
@@ -166,9 +167,7 @@
%attr(755,root,root) %{_libexecdir}/nm-dispatcher.action
%attr(755,root,root) %{_libexecdir}/libnm-settings-plugin-keyfile.so
%attr(754,root,root) /etc/rc.d/init.d/NetworkManager
-%attr(755,root,root) /lib/udev/nm-modem-probe
-/lib/udev/rules.d/77-nm-probe-modem-capabilities.rules
-/lib/udev/rules.d/77-nm-zte-port-types.rules
+/lib/udev/rules.d/77-nm-olpc-mesh.rules
%dir %{_sysconfdir}/NetworkManager
%dir %{_sysconfdir}/NetworkManager/VPN
%dir %{_sysconfdir}/NetworkManager/dispatcher.d
@@ -176,8 +175,7 @@
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/NetworkManager/nm-system-settings.conf
%dir %{_datadir}/%{name}
%dir /var/run/%{name}
-%{_datadir}/PolicyKit/policy/org.freedesktop.network-manager-settings.system.policy
-%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service
+%{_datadir}/polkit-1/actions/org.freedesktop.network-manager-settings.system.policy
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
%{_datadir}/%{name}/gdb-cmd
%{_mandir}/man8/NetworkManager.8*
@@ -185,7 +183,6 @@
%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-system-settings.conf
%config(noreplace) %verify(not md5 mtime size)
/etc/dbus-1/system.d/NetworkManager.conf
%files apidocs
@@ -197,31 +194,34 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libnm-util.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libnm-util.so.1
-%attr(755,root,root) %{_libdir}/libnm_glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnm_glib.so.0
-%attr(755,root,root) %{_libdir}/libnm_glib_vpn.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnm_glib_vpn.so.0
+%attr(755,root,root) %{_libdir}/libnm-glib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnm-glib.so.2
+%attr(755,root,root) %{_libdir}/libnm-glib-vpn.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnm-glib-vpn.so.1
+
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libnm-util.so
-%attr(755,root,root) %{_libdir}/libnm_glib.so
-%attr(755,root,root) %{_libdir}/libnm_glib_vpn.so
+%attr(755,root,root) %{_libdir}/libnm-glib.so
+%attr(755,root,root) %{_libdir}/libnm-glib-vpn.so
%{_libdir}/libnm-util.la
-%{_libdir}/libnm_glib.la
-%{_libdir}/libnm_glib_vpn.la
+%{_libdir}/libnm-glib.la
+%{_libdir}/libnm-glib-vpn.la
%{_includedir}/NetworkManager
%{_includedir}/libnm-glib
%{_pkgconfigdir}/NetworkManager.pc
%{_pkgconfigdir}/libnm-util.pc
-%{_pkgconfigdir}/libnm_glib_vpn.pc
-%{_pkgconfigdir}/libnm_glib.pc
+%{_pkgconfigdir}/libnm-glib-vpn.pc
+%{_pkgconfigdir}/libnm-glib.pc
+
%files static
%defattr(644,root,root,755)
%{_libdir}/libnm-util.a
-%{_libdir}/libnm_glib.a
-%{_libdir}/libnm_glib_vpn.a
+%{_libdir}/libnm-glib.a
+%{_libdir}/libnm-glib-vpn.a
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -229,6 +229,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.61 2010/02/05 23:15:08 qwiat
+- update to 0.7.999
+
Revision 1.60 2009/11/27 22:39:09 megabajt
- updated to 0.7.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager-pld.patch?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager.spec?r1=1.60&r2=1.61&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
