spec file fix

[openvswitch.git] / openvswitch.spec

diff --git a/openvswitch.spec b/openvswitch.spec
index 759ab63..7dbc1d9 100644 (file)
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -1,11 +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
+%define upstream "http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=snapshot;h=ef72dd87d6ad4e511d1e0bddc31d4716f0914fab;sf=tgz"
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -20,6 +20,7 @@ License: GPL
 Group: System Environment/Kernel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 #Requires: 
+BuildRequires: kernel-devel
 
 Source0: openvswitch-%{version}.tar.gz
 
@@ -28,13 +29,13 @@ Openvswitch - virtual switches on PlanetLab
 
 %prep
 %setup
-wget %{upstream}
-tar xvfz openvswitch-%{version}.tar.gz
-cd openvswitch-%{version}
+wget -Oopenvswitch-%{version}.tar.gz %{upstream}
+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
+./boot.sh
+./configure --with-linux=/usr/src/kernels/$KVER
 make -j17
 
 %install
@@ -46,7 +47,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
@@ -65,6 +66,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.