From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 25 Mar 2014 14:27:08 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/transforward
X-Git-Tag: transforward-0.1-6~2
X-Git-Url: http://git.onelab.eu/?p=transforward.git;a=commitdiff_plain;h=1a25d1ceafac99d0553782b5be1effba837a2df5;hp=-c

Merge branch 'master' of ssh://git.onelab.eu/git/transforward
---

1a25d1ceafac99d0553782b5be1effba837a2df5
diff --combined transforward.spec
index ae1806d,3097781..a103018
--- a/transforward.spec
+++ b/transforward.spec
@@@ -1,15 -1,12 +1,15 @@@
  %define name transforward
  %define version 0.1
- %define taglevel 4
+ %define taglevel 5
  
  ### legacy from locally-built kernels, used to define these
  # kernel_release : 1.fc16  (24 is then the planetlab taglevel)
  # kernel_version : 3.3.7
  # kernel_arch :    i686 | x86_64
  
 +# 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
  # this line below
  #%define module_release %( rpm -q --qf "%{version}" kernel-headers )
@@@ -20,7 -17,6 +20,7 @@@
  %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 )
 +%endif
  
  # this is getting really a lot of stuff, could be made simpler probably
  %define release %{kernel_version}.%{kernel_release}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@@ -75,6 -71,9 +75,9 @@@ rm -rf $RPM_BUILD_ROO
  %postun
  
  %changelog
+ * Fri Mar 21 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-5
+ - harmless (changed default build kernel to the latest kernel in use)
+ 
  * Wed Aug 28 2013 Sapan Bhatia <sapanb@cs.princeton.edu> - transforward-0.1-4
  - * Bug fixes, which should lead to increased stability
  - * Install via make and make install