fixes for rpmbuild

[mirror_lxc.git] / lxc.spec.in

diff --git a/lxc.spec.in b/lxc.spec.in
index 86832d1f138b2fecccadb9a496cfcfa937298333..d0bb7a121610d6ef65085bb53f775f7debaab0bb 100644 (file)
--- a/lxc.spec.in
+++ b/lxc.spec.in
@@ -44,6 +44,13 @@ or the freeze of the container. This package is useful to create
 Virtual Private Server, or to run isolated applications like bash or
 sshd.
 
+%package        libs
+Summary:        runtime library files for %{name}
+Group:          System Environment/Libraries
+
+%description    libs
+The %{name}-libs package contains libraries for running %{name} applications.
+
 %package devel
 Release: 1
 Summary: development library for %{name}
@@ -56,7 +63,8 @@ development of the linux containers.
 %prep
 %setup
 %build
-PATH=$PATH:/usr/sbin:/sbin %configure
+test "%{ksrc}" != "none" && args="--with-linuxdir=%{ksrc}"
+PATH=$PATH:/usr/sbin:/sbin %configure $args --disable-rpath
 make %{?_smp_mflags}
 
 %install
@@ -68,41 +76,45 @@ find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} ';'
 rm -rf %{buildroot}
 
 %post
-mkdir -p /var/lxc
-chmod ugo+w /var/lxc
-
-setcap cap_sys_admin=ep %{_bindir}/lxc-init
-
-setcap cap_sys_admin=ep %{_bindir}/lxc-netstat
-
-setcap cap_sys_admin=ep %{_bindir}/lxc-create
-
-setcap cap_sys_chroot,cap_setpcap,cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
-    %{_bindir}/lxc-execute
-
-setcap cap_sys_chroot,cap_setpcap,cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
-    %{_bindir}/lxc-start
-
-setcap cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
-    %{_bindir}/lxc-restart
-
-setcap cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
-    %{_bindir}/lxc-unshare
 
 %files
 %defattr(-,root,root)
-%{_sysconfdir}/%{name}/*
-%{_libdir}/*.so*
 %{_bindir}/*
+%attr(4111,root,root) %{_bindir}/lxc-attach
+%attr(4111,root,root) %{_bindir}/lxc-create
+%attr(4111,root,root) %{_bindir}/lxc-clone
+%attr(4111,root,root) %{_bindir}/lxc-start
+%attr(4111,root,root) %{_bindir}/lxc-netstat
+%attr(4111,root,root) %{_bindir}/lxc-unshare
+%attr(4111,root,root) %{_bindir}/lxc-execute
+%attr(4111,root,root) %{_bindir}/lxc-checkpoint
+%attr(4111,root,root) %{_bindir}/lxc-restart
 %{_mandir}/*
+%{_datadir}/doc/*
+
+%files libs
+%defattr(-,root,root)
+%{_libdir}/*.so.*
+%{_libdir}/%{name}
+%attr(4555,root,root) %{_libdir}/%{name}/lxc-init
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/%{name}/*
-%{_libdir}/*.so*
-%{_libdir}/*.a
+%{_libdir}/*.so
+%{_datadir}/pkgconfig/*
 
 %changelog
+* Thu Sep  8 2011 Greg Kurz <gkurz@fr.ibm.com> - Version 0.7.5.1
+- fix installed files for rpmbuild
+- introduce lxc-libs package
+
+* Fri Jul 23 2010 Daniel Lezcano <dlezcano@fr.ibm.com> - Version 0.7.2
+- set attribute for installed files
+- fix libraries installation
+
+* Mon Mar 24 2009 Daniel Lezcano <daniel.lezcano@free.fr> - Version 0.6.1
+- Removed capability setting, let the user to do that through "lxc-setcap"
 
 * Mon Feb 16 2009 Daniel Lezcano <daniel.lezcano@free.fr> - Version 0.6.0
 - Added more capabilities to the executables