[openlmi-networking] Fix for NetworkManager 0.9.9

Radek Novacek rnovacek at fedoraproject.org
Mon Jun 17 08:23:38 UTC 2013


commit 512cafefbd11d36315a129cdd3dc0123dc096c64
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Mon Jun 17 10:23:24 2013 +0200

    Fix for NetworkManager 0.9.9

 openlmi-networking-0.0.9-fix-for-NM-0.9.9.patch |   33 +++++++++++++++++++++++
 openlmi-networking.spec                         |    9 +++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/openlmi-networking-0.0.9-fix-for-NM-0.9.9.patch b/openlmi-networking-0.0.9-fix-for-NM-0.9.9.patch
new file mode 100644
index 0000000..4eda7cf
--- /dev/null
+++ b/openlmi-networking-0.0.9-fix-for-NM-0.9.9.patch
@@ -0,0 +1,33 @@
+commit d97464e4a06d56f802a7b690da69653caa14ad24
+Author: Radek Novacek <rnovacek at redhat.com>
+Date:   Mon Jun 17 10:06:25 2013 +0200
+
+    Fix compilation with NM 0.9.9
+
+diff --git a/src/port.h b/src/port.h
+index 053edf8..1f89da9 100644
+--- a/src/port.h
++++ b/src/port.h
+@@ -36,7 +36,8 @@ typedef enum PortType {
+     TYPE_BOND,
+     TYPE_BRIDGE,
+     TYPE_VLAN,
+-    TYPE_ADSL
++    TYPE_ADSL,
++    TYPE_GENERIC
+ } PortType;
+ 
+ typedef enum PortOperatingStatus {
+diff --git a/src/port_nm.c b/src/port_nm.c
+index 07c6bf3..ae1b553 100644
+--- a/src/port_nm.c
++++ b/src/port_nm.c
+@@ -156,7 +156,7 @@ Port *port_new_from_objectpath(Network *network, const char *objectpath)
+                 break;
+ #ifdef NM_DBUS_INTERFACE_DEVICE_GENERIC
+             case NM_DEVICE_TYPE_GENERIC:
+-                port->type = TYPE_GENERIC:
++                port->type = TYPE_GENERIC;
+                 priv->subinterface = NM_DBUS_INTERFACE_DEVICE_GENERIC;
+ #endif
+             default:
diff --git a/openlmi-networking.spec b/openlmi-networking.spec
index 0503296..fe60f64 100644
--- a/openlmi-networking.spec
+++ b/openlmi-networking.spec
@@ -1,12 +1,15 @@
 Name:           openlmi-networking
 Version:        0.0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        CIM providers for network management
 
 License:        LGPLv2+
 URL:            http://fedorahosted.org/openlmi/
 Source0:        http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
 
+# Fix compilation error with NetworkManager 0.9.9
+Patch0:         openlmi-networking-0.0.9-fix-for-NM-0.9.9.patch
+
 # Upstream name has been changed from cura-networking to openlmi-networking
 Provides:       cura-networking%{?_isa} = %{version}-%{release}
 Obsoletes:      cura-networking < 0.0.5-1
@@ -37,6 +40,7 @@ Common Information Model (CIM).
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -91,6 +95,9 @@ fi
 
 
 %changelog
+* Mon Jun 17 2013 Radek Novacek <rnovacek at redhat.com> 0.0.9-2
+- Fix for NetworkManager 0.9.9
+
 * Mon Jun 17 2013 Radek Novacek <rnovacek at redhat.com> 0.0.9-1
 - Version 0.0.9
 


More information about the scm-commits mailing list