[lxc-devel] [lxc/master] RPM build fixes

[evgeni on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 490 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20161029/3208a281/attachment.bin>
-------------- next part --------------
From 73bf2763668ca23ba71427acb140a2aa5fcb6030 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni at debian.org>
Date: Sat, 29 Oct 2016 20:29:08 +0200
Subject: [PATCH 1/2] use python3_sitearch for including the python code

Closes: #502
Signed-off-by: Evgeni Golov <evgeni at debian.org>
---
 lxc.spec.in | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lxc.spec.in b/lxc.spec.in
index bd77176..d52259e 100644
--- a/lxc.spec.in
+++ b/lxc.spec.in
@@ -269,9 +269,6 @@ fi
 %{_sbindir}/*
 %{_libdir}/*.so.*
 %{_libdir}/%{name}
-%if %{with_python}
-%{_libdir}/python*
-%endif
 %{_localstatedir}/*
 %{_libexecdir}/%{name}
 %attr(4111,root,root) %{_libexecdir}/%{name}/lxc-user-nic
@@ -281,8 +278,7 @@ fi
 %endif
 
 %if %{with_python}
-%{_libdir}/python3.3/site-packages/_lxc*
-%{_libdir}/python3.3/site-packages/lxc/*
+%{python3_sitearch}/*
 %endif
 
 %if %{with_lua}

From bc3957565674fbd24e786820cb3bb97191a3c59a Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni at debian.org>
Date: Sat, 29 Oct 2016 20:29:18 +0200
Subject: [PATCH 2/2] fix rpm build, include all built files, but only once

Signed-off-by: Evgeni Golov <evgeni at debian.org>
---
 lxc.spec.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lxc.spec.in b/lxc.spec.in
index d52259e..94a9504 100644
--- a/lxc.spec.in
+++ b/lxc.spec.in
@@ -252,13 +252,13 @@ fi
 %{_datadir}/doc/*
 %{_datadir}/lxc/*
 %{_sysconfdir}/bash_completion.d
-%{_sysconfdir}/sysconfig/*
 %config(noreplace) %{_sysconfdir}/lxc/*
 %config(noreplace) %{_sysconfdir}/sysconfig/*
 
 %if %{with_systemd}
 %{_unitdir}/lxc-net.service
 %{_unitdir}/lxc.service
+%{_unitdir}/lxc at .service
 %else
 %{_sysconfdir}/rc.d/init.d/lxc
 %{_sysconfdir}/rc.d/init.d/lxc-net
@@ -270,7 +270,9 @@ fi
 %{_libdir}/*.so.*
 %{_libdir}/%{name}
 %{_localstatedir}/*
-%{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/hooks/unmount-namespace
+%{_libexecdir}/%{name}/lxc-apparmor-load
+%{_libexecdir}/%{name}/lxc-monitord
 %attr(4111,root,root) %{_libexecdir}/%{name}/lxc-user-nic
 %if %{with_systemd}
 %attr(555,root,root) %{_libexecdir}/%{name}/lxc-net