From b9cb4325d74fb01dc4e71adc211e7e7052471778 Mon Sep 17 00:00:00 2001 From: Dwight Engen Date: Tue, 11 Sep 2012 14:30:22 -0400 Subject: [PATCH] lxc-rpm-build Fix building of rpm by non-root user. Include templates in rpm, fix rpm path of lxc-init. Signed-off-by: Dwight Engen --- lxc.spec.in | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lxc.spec.in b/lxc.spec.in index da7339a82..18518085d 100644 --- a/lxc.spec.in +++ b/lxc.spec.in @@ -68,9 +68,9 @@ PATH=$PATH:/usr/sbin:/sbin %configure $args --disable-rpath make %{?_smp_mflags} %install -%makeinstall - -find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} ';' +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} +find %{buildroot} -type f -name '*.la' -exec rm -f {} ';' %clean rm -rf %{buildroot} @@ -92,20 +92,26 @@ rm -rf %{buildroot} %attr(4111,root,root) %{_bindir}/lxc-restart %{_mandir}/* %{_datadir}/doc/* +%{_datadir}/lxc/* %files libs %defattr(-,root,root) %{_libdir}/*.so.* %{_libdir}/%{name} -%attr(4555,root,root) %{_libdir}/%{name}/lxc-init +%attr(4555,root,root) %{_libexecdir}/%{name}/lxc-init %files devel %defattr(-,root,root) %{_includedir}/%{name}/* %{_libdir}/*.so -%{_datadir}/pkgconfig/* +%{_libdir}/pkgconfig/* %changelog +* Mon Sep 10 2012 Dwight Engen - Version 0.8.0 +- fix lxc-init moved to libexec +- .pc moved to _libdir +- package template files /usr/share/lxc/templates + * Thu Sep 8 2011 Greg Kurz - Version 0.7.5.1 - fix installed files for rpmbuild - introduce lxc-libs package