Author: nanardon
Date: Fri Feb 16 16:58:56 2007
New Revision: 121928
Added:
packages/cooker/networkmanager/current/SOURCES/NetworkManager-dbus-dcl.patch
Modified:
packages/cooker/networkmanager/current/SPECS/networkmanager.spec
Log:
- fix buildrequires
- patch2 fix compil with latest dbus
Added:
packages/cooker/networkmanager/current/SOURCES/NetworkManager-dbus-dcl.patch
==============================================================================
--- (empty file)
+++
packages/cooker/networkmanager/current/SOURCES/NetworkManager-dbus-dcl.patch
Fri Feb 16 16:58:56 2007
@@ -0,0 +1,16 @@
+Index: src/NetworkManagerDbus.c
+===================================================================
+--- src/NetworkManagerDbus.c
++++ src/NetworkManagerDbus.c 2007-02-16 16:54:07.460531762 +0100
+@@ -834,7 +834,11 @@
+ #if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
+ flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now
the default */
+ #else
++#ifdef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT
+ flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;
++#else
++ flags = 0;
++#endif
+ #endif
+ ret = dbus_bus_request_name (connection, NM_DBUS_SERVICE, flags,
&error);
+ if (dbus_error_is_set (&error))
Modified: packages/cooker/networkmanager/current/SPECS/networkmanager.spec
==============================================================================
--- packages/cooker/networkmanager/current/SPECS/networkmanager.spec
(original)
+++ packages/cooker/networkmanager/current/SPECS/networkmanager.spec Fri Feb
16 16:58:56 2007
@@ -1,7 +1,7 @@
%define name networkmanager
%define rname NetworkManager
%define version 0.6.4
-%define release %mkrel 4
+%define release %mkrel 5
%define glib_name %{name}-glib
%define util_name %{name}-util
@@ -19,12 +19,18 @@
Source0: %{rname}-%{version}.tar.bz2
Patch0: NetworkManager-0.6.4-linux_if.patch.bz2
Patch1: NetworkManager-0.6.4-close.patch.bz2
+Patch2: NetworkManager-dbus-dcl.patch
License: GPL
Group: System/Configuration/Networking
Url: http://www.gnome.org/projects/NetworkManager/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: libnl-devel dhcdbd wpa_supplicant libiw-devel
BuildRequires: perl(XML::Parser)
+BuildRequires: hal-devel >= 0.5.0
+BuildRequires: libglade2.0-devel
+BuildRequires: libGConf2-devel
+BuildRequires: gnome-keyring-devel
+BuildRequires: gnome-panel-devel
Requires: dhcdbd wpa_supplicant wireless-tools
Requires(post): rpm-helper
Requires(preun): rpm-helper
@@ -76,6 +82,7 @@
%setup -q -n %{rname}-%{version}
%patch0 -p1 -b .linux_if
%patch1 -p1 -b .close
+%patch2 -p0 -b .dbus-dcl
%build
%configure2_5x --localstatedir=%{_var}
