X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=transforward.spec;h=96013521ddfaa762dbe3966e9aa25b9c02520887;hb=df648b360e9c2e246b0961e98fc9de020d7ad334;hp=c4fd3e2a750f5f560e296b6d77a66033baf53a68;hpb=4fcb7058308338f07c76f8beb1a7f407672a8ea4;p=transforward.git

diff --git a/transforward.spec b/transforward.spec
index c4fd3e2..9601352 100644
--- a/transforward.spec
+++ b/transforward.spec
@@ -1,6 +1,6 @@
 %define name transforward
 %define version 0.1
-%define taglevel 7
+%define taglevel 11
 
 ### legacy from locally-built kernels, used to define these
 # kernel_release : 1.fc16  (24 is then the planetlab taglevel)
@@ -10,16 +10,18 @@
 # when no custom kernel is being built, kernel_version is defined but empty
 %define _with_planetlab_kernel %{?kernel_version:1}%{!?kernel_version:0}
 %if ! %{_with_planetlab_kernel}
-# compute this with "rpm -q --qf .. kernel-devel" when with the stock kernel
+
+# compute these with "rpm -q --qf .. kernel-devel" when with the stock kernel
 # this line below
-#%define module_release %( rpm -q --qf "%{version}" kernel-headers )
+#%define module_release %( rpm -q --qf "%{version}" kernel-devel )
 # causes recursive macro definition no matter how much you quote
+
 %define percent %
 %define braop \{
 %define bracl \}
-%define kernel_version %( rpm -q --qf %{percent}%{braop}version%{bracl} kernel-headers )
-%define kernel_release %( rpm -q --qf %{percent}%{braop}release%{bracl} kernel-headers )
-%define kernel_arch %( rpm -q --qf %{percent}%{braop}arch%{bracl} kernel-headers )
+%define kernel_version %( rpm -q --qf %{percent}%{braop}version%{bracl} kernel-devel )
+%define kernel_release %( rpm -q --qf %{percent}%{braop}release%{bracl} kernel-devel )
+%define kernel_arch %( rpm -q --qf %{percent}%{braop}arch%{bracl} kernel-devel )
 %endif
 
 # this is getting really a lot of stuff, could be made simpler probably
@@ -43,11 +45,12 @@ License: GPL
 Group: System Environment/Kernel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Source0: transforward-%{version}.tar.gz
+Requires: kernel = %{kernel_version}-%{kernel_release}
 
 %description
 Kernel module that transparently forwards ports between containers
 
-%prep 
+%prep
 %setup -q
 
 %build
@@ -75,6 +78,18 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 
 %changelog
+* Sun Jul 16 2017 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-11
+- no glock.h in kernel 4.9
+
+* Sun Jul 10 2016 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-10
+- fix to compile against linux 4.6 under f24
+
+* Fri Apr 03 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-9
+- only cleaned up the systemd unit file to remove ControlGroup:
+
+* Wed Feb 18 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-8
+- add a requirement to the right kernel rpm
+
 * Wed Jul 16 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-7
 - tweak for building against a home-made kernel
 
@@ -91,4 +106,3 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Jul 09 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-2
 - load module at boot-time
 - various tweaks, remove debugging statements
-