Resolved conflict

diff --combined openvswitch.spec
index 92530a2,a563464..a3cb4a8
--- 1/openvswitch.spec
--- 2/openvswitch.spec
+++ b/openvswitch.spec
@@@ -1,8 -1,8 +1,8 @@@
  %define url $URL$
  
  %define name openvswitch
 -%define version 1.1.0pre2
 -%define taglevel 2
 +%define version 1.3.0
 +%define taglevel 1
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  %define upstream http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
@@@ -34,7 -34,7 +34,7 @@@ tar xvfz openvswitch-%{version}.tar.gz 
  
  %build
  KVER=`ls -l /usr/src/kernels | awk '{printf $9;}'`
 -./configure --with-l26=/usr/src/kernels/$KVER
 +./configure --with-linux=/usr/src/kernels/$KVER
  make -j17
  
  %install
@@@ -46,7 -46,7 +46,7 @@@ mkdir -p $RPM_BUILD_ROOT/va
  mkdir -p $RPM_BUILD_ROOT/lib/modules/$KVER/kernel/drivers/net
  
  make install DESTDIR=$RPM_BUILD_ROOT
 -cp -R datapath/linux-2.6/*.ko $RPM_BUILD_ROOT/lib/modules/$KVER/kernel/drivers/net
 +cp -R datapath/linux/*.ko $RPM_BUILD_ROOT/lib/modules/$KVER/kernel/drivers/net
  
  %clean
  rm -rf $RPM_BUILD_ROOT
@@@ -65,6 -65,9 +65,9 @@@
  %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.