X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=procprotect.spec;h=f74d940e0ddd2ebddbca84e271afd799289271b8;hb=a20473624b9a260533bd32dadbc073c38253cc65;hp=3251c22b69fcaf797dc716d5bef6ccad45e68229;hpb=f70c77aa82b35c10e6256dbdef263518fb1f4c14;p=procprotect.git

diff --git a/procprotect.spec b/procprotect.spec
index 3251c22..f74d940 100644
--- a/procprotect.spec
+++ b/procprotect.spec
@@ -1,12 +1,15 @@
 %define name procprotect
 %define version 0.4
-%define taglevel 1
+%define taglevel 3
 
 ### 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 )
@@ -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}}
@@ -50,11 +54,9 @@ make -C %{kernelpath} V=1 M=$(pwd) modules
 
 %install
 install -D -m 755 procprotect.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_id}/kernel/net/procprotect/procprotect.ko
-mkdir -p $RPM_BUILD_ROOT/etc/modules-load.d
-install -m 644 procprotect.conf $RPM_BUILD_ROOT/etc/modules-load.d/procprotect.conf
-mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system
-install -m 644 procprotect.service $RPM_BUILD_ROOT/usr/lib/systemd/system/procprotect.service
-install -m 755 procprotect.init $RPM_BUILD_ROOT/usr/sbin/procprotect.init
+install -D -m 644 procprotect.conf $RPM_BUILD_ROOT/etc/modules-load.d/procprotect.conf
+install -D -m 644 procprotect.service $RPM_BUILD_ROOT/usr/lib/systemd/system/procprotect.service
+install -D -m 755 procprotect.init $RPM_BUILD_ROOT/usr/sbin/procprotect.init
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,6 +74,13 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 
 %changelog
+* Fri Mar 21 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - procprotect-0.4-3
+- guarded against some hypothetically possible errors
+
+* Wed Aug 28 2013 Sapan Bhatia <sapanb@cs.princeton.edu> - procprotect-0.4-2
+- * Bug fixes that should lead to increased stability
+- * Install via make and make install
+
 * Mon Aug 19 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - procprotect-0.4-1
 - working version with kernels 3.10