X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxctools.spec;h=99d3e7990c7d2e3ab2fcc3c9f1baccaf01b2b7dd;hb=9c6440a4f7565e7e8ce0a7fcd1a964b26e9b17f4;hp=02fb41e7affb3db9652d59f6f127c21abf2ef470;hpb=11efbe0866a6a1af5f31a32238ce548ac605c4a9;p=lxc-userspace.git

diff --git a/lxctools.spec b/lxctools.spec
index 02fb41e..99d3e79 100644
--- a/lxctools.spec
+++ b/lxctools.spec
@@ -1,26 +1,18 @@
 %define name lxctools
-%define version 0.1
-%define taglevel 1
+%define version 0.9
+%define taglevel 5
 
 %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 )
 
 # this is getting really a lot of stuff, could be made simpler probably
-%define release %{kernel_version}.%{kernel_release}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-
-%define kernel_id %{kernel_version}-%{kernel_release}.%{kernel_arch}
-%define kernelpath /usr/src/kernels/%{kernel_id}
-
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
 URL: %{SCMURL}
-Requires: kernel = %{kernel_version}-%{kernel_release}
 
 Summary: Userspace tools for switching between lxc containers
 Name: %{name}
@@ -41,18 +33,30 @@ Userspace tools for switching between lxc containers.
 make 
 
 %install
+mkdir -p $RPM_BUILD_ROOT/usr/sbin
+install -D -m 755 vsh $RPM_BUILD_ROOT/usr/sbin/vsh
+install -D -m 755 lxcsu $RPM_BUILD_ROOT/usr/sbin/lxcsu
+chmod u+s $RPM_BUILD_ROOT/usr/sbin/lxcsu
 cp build/lib*/setns.so $RPM_BUILD_ROOT/usr/sbin
-install -D -m 755 $RPM_BUILD_ROOT/vsh /usr/sbin/vsh
-install -D -m 755 $RPM_BUILD_ROOT/lxcsu /usr/sbin/lxcsu
-chmod u+s $RPM_BUILD_ROOT/lxcsu/usr/sbin/vsh
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-/usr/sbin
-/lib
+/usr/sbin/*
+
+%post
+chmod u+s /usr/sbin/vsh
 
 %postun
 
 %changelog
+* Thu Mar 07 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - lxctools-0.9-4
+- nicer polish to lxcsu returning the right thing
+
+* Mon Mar 04 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - lxctools-0.9-3
+- lxcsu to propagate its forked process's return code
+
+* Fri Feb 22 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - lxctools-0.9-2
+- various fixes
+