X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=transforward.spec;h=96013521ddfaa762dbe3966e9aa25b9c02520887;hb=df648b360e9c2e246b0961e98fc9de020d7ad334;hp=6c817fbc47185024413a2c5a907cbaaf533b62fa;hpb=679663310f7fac5fac4f45f7c56b8ed7910ad777;p=transforward.git diff --git a/transforward.spec b/transforward.spec index 6c817fb..9601352 100644 --- a/transforward.spec +++ b/transforward.spec @@ -1,6 +1,6 @@ %define name transforward %define version 0.1 -%define taglevel 10 +%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 @@ -48,7 +50,7 @@ Requires: kernel = %{kernel_version}-%{kernel_release} %description Kernel module that transparently forwards ports between containers -%prep +%prep %setup -q %build @@ -76,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %postun %changelog +* Sun Jul 16 2017 Thierry Parmentelat - transforward-0.1-11 +- no glock.h in kernel 4.9 + * Sun Jul 10 2016 Thierry Parmentelat - transforward-0.1-10 - fix to compile against linux 4.6 under f24 @@ -101,4 +106,3 @@ rm -rf $RPM_BUILD_ROOT * Mon Jul 09 2012 Thierry Parmentelat - transforward-0.1-2 - load module at boot-time - various tweaks, remove debugging statements -