From: Thierry Parmentelat 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=7e071959ac7918a1fb0a42a3b04861db6e499c79 Merge branch 'master' of ssh://git.onelab.eu/git/transforward --- diff --git a/Makefile b/Makefile index 1a9368e..e0f7bf6 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ ARCH=$(shell uname -m) DIST=fc18 ifeq ($(wildcard /lib/modules/$(KVER)/build),) - KVER=3.10.6-100.$(DIST).$(ARCH) + KVER=3.10.12-100.$(DIST).$(ARCH) endif all: diff --git a/transforward.spec b/transforward.spec index ae1806d..a103018 100644 --- a/transforward.spec +++ b/transforward.spec @@ -1,6 +1,6 @@ %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) @@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %postun %changelog +* Fri Mar 21 2014 Thierry Parmentelat - transforward-0.1-5 +- harmless (changed default build kernel to the latest kernel in use) + * Wed Aug 28 2013 Sapan Bhatia - transforward-0.1-4 - * Bug fixes, which should lead to increased stability - * Install via make and make install