X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=openvswitch.spec;h=a7faab0dc78944c128fac15f5f9528c20763d941;hb=340a84bc75bcabf8cda57fe8124c6db7896aff5d;hp=3a73c57829afb13da5373d9051ca6dc90bae5494;hpb=7600a57c50d9662535e289f1341458b27fd7ed2a;p=openvswitch.git

diff --git a/openvswitch.spec b/openvswitch.spec
index 3a73c57..a7faab0 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -1,10 +1,11 @@
 %define url $URL$
 
 %define name openvswitch
-%define version 1.1.0pre2
+%define version ef72dd8
 %define taglevel 1
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define upstream http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -19,18 +20,20 @@ License: GPL
 Group: System Environment/Kernel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 #Requires: 
+BuildRequires: kernel-devel
 
-Source: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz
+Source0: openvswitch-%{version}.tar.gz
 
 %description
 Openvswitch - virtual switches on PlanetLab
 
 %prep
 %setup
+tar xvfz openvswitch-%{version}.tar.gz --strip=1
 
 %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
@@ -42,7 +45,7 @@ mkdir -p $RPM_BUILD_ROOT/var
 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
@@ -61,6 +64,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.