Resolved conflict

diff --git a/openvswitch.spec b/openvswitch.spec
index 92530a2..a3cb4a8 100644 (file)
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 
 %changelog
+* Mon Sep 26 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - openvswitch-1.1.0pre2-2
+- add a buildrequires dep. to kernel-devel
+
 * Mon Jan 17 2011 Sapan Bhatia <sapanb@cs.princeton.edu> - openvswitch-1.1.0pre2-1
 - Fixed a build issue.