git://git.onelab.eu
/
openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolved conflict
[openvswitch.git]
/
openvswitch.spec
diff --git
a/openvswitch.spec
b/openvswitch.spec
index
c8ffd9c
..
a3cb4a8
100644
(file)
--- a/
openvswitch.spec
+++ b/
openvswitch.spec
@@
-1,7
+1,7
@@
%define url $URL$
%define name openvswitch
%define url $URL$
%define name openvswitch
-%define version 1.
1.0pre2
+%define version 1.
3.0
%define taglevel 1
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%define taglevel 1
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@
-20,6
+20,7
@@
License: GPL
Group: System Environment/Kernel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
#Requires:
Group: System Environment/Kernel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
#Requires:
+BuildRequires: kernel-devel
Source0: openvswitch-%{version}.tar.gz
Source0: openvswitch-%{version}.tar.gz
@@
-33,7
+34,7
@@
tar xvfz openvswitch-%{version}.tar.gz --strip=1
%build
KVER=`ls -l /usr/src/kernels | awk '{printf $9;}'`
%build
KVER=`ls -l /usr/src/kernels | awk '{printf $9;}'`
-./configure --with-l
26
=/usr/src/kernels/$KVER
+./configure --with-l
inux
=/usr/src/kernels/$KVER
make -j17
%install
make -j17
%install
@@
-45,7
+46,7
@@
mkdir -p $RPM_BUILD_ROOT/var
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KVER/kernel/drivers/net
make install DESTDIR=$RPM_BUILD_ROOT
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
%clean
rm -rf $RPM_BUILD_ROOT
@@
-64,6
+65,9
@@
rm -rf $RPM_BUILD_ROOT
%postun
%changelog
%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.
* Mon Jan 17 2011 Sapan Bhatia <sapanb@cs.princeton.edu> - openvswitch-1.1.0pre2-1
- Fixed a build issue.