X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=lxc.spec;h=9dc9149e75726fa9fb2132eea760aa941ae85864;hb=ef5bd4a472a864105ef770c2b881f89cdd0e0423;hp=9623703734f4eff414992e01428a60ece166cd86;hpb=4e82464d33000ceb29b8bcbc3509e3e87bba1af1;p=packages%2Flxc.git

diff --git a/lxc.spec b/lxc.spec
index 9623703..9dc9149 100644
--- a/lxc.spec
+++ b/lxc.spec
@@ -12,15 +12,16 @@
 Summary:	Linux Containers userspace tools
 Summary(pl.UTF-8):	Narzędzia do kontenerów linuksowych (LXC)
 Name:		lxc
-Version:	1.0.0
-Release:	0.2
+Version:	1.0.5
+Release:	3
 License:	LGPL v2.1+
 Group:		Applications/System
-Source0:	http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz
-# Source0-md5:	87a9d168a6e55326303cce3b2cb7f82e
+Source0:	https://www.linuxcontainers.org/downloads/%{name}-%{version}.tar.gz
+# Source0-md5:	9d9af9e9e69a831cd50b58d91c786013
 Source1:	%{name}-pld.in.sh
+Source2:	%{name}.init
 Patch1:		%{name}-pld.patch
-URL:		http://linuxcontainers.org/
+URL:		https://www.linuxcontainers.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	docbook-dtd30-sgml
@@ -30,14 +31,20 @@ BuildRequires:	gnutls-devel
 %{?with_apparmor:BuildRequires:	libapparmor-devel}
 BuildRequires:	libcap-devel
 %{?with_seccomp:BuildRequires:	libseccomp-devel}
+BuildRequires:	libxslt-progs
 %{?with_lua:BuildRequires:	lua51-devel >= 5.1}
 BuildRequires:	pkgconfig
 %{?with_python:BuildRequires:	python3-devel >= 3.2}
+BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.612
 BuildRequires:	sed >= 4.0
 Requires:	rc-scripts >= 0.4.6
 Requires:	which
+Suggests:	gnupg
+Suggests:	gnupg-plugin-keys_curl
+Suggests:	gnupg-plugin-keys_hkp
 Suggests:	net-tools
+Suggests:	python3-lxc
 Suggests:	rsync
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -147,7 +154,10 @@ cp -p %{SOURCE1} templates/lxc-pld.in
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{configpath},/var/{cache,log}/lxc}
+install -d $RPM_BUILD_ROOT{%{configpath},%{configpath}snap,/var/{cache,log}/lxc}  \
+        -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+
+
 %{__make} install \
 	SYSTEMD_UNIT_DIR=%{systemdunitdir} \
 	pcdatadir=%{_pkgconfigdir} \
@@ -158,12 +168,20 @@ install -d $RPM_BUILD_ROOT{%{configpath},/var/{cache,log}/lxc}
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}
 
+# apparmor profiles are not packaged, remove to avoid packagers confusion
+%{__rm} -r $RPM_BUILD_ROOT/etc/apparmor.d
+
+# yum plugin, no idea where to package this
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/lxc-patch.py
+
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/lxc
+
 %if %{with python}
 %py3_comp $RPM_BUILD_ROOT%{py3_sitedir}/lxc
 %py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}/lxc
 %endif
 %if %{with lua}
-%{__sed} -i -e '1s,#!/usr/bin/env lua,#!/usr/bin/lua51,' $RPM_BUILD_ROOT%{_bindir}/lxc-top
+%{__sed} -i -e '1s,#!/usr/bin/env lua,#!/usr/bin/lua5.1,' $RPM_BUILD_ROOT%{_bindir}/lxc-top
 %endif
 
 %clean
@@ -174,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CONTRIBUTING MAINTAINERS README TODO doc/FAQ.txt doc/examples/*.conf
+%doc AUTHORS CONTRIBUTING MAINTAINERS README  doc/FAQ.txt doc/examples/*.conf
 %attr(755,root,root) %{_bindir}/lxc-attach
 %attr(755,root,root) %{_bindir}/lxc-autostart
 %attr(755,root,root) %{_bindir}/lxc-cgroup
@@ -195,6 +213,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/lxc-unshare
 %attr(755,root,root) %{_bindir}/lxc-usernsexec
 %attr(755,root,root) %{_bindir}/lxc-wait
+%attr(755,root,root) %{_sbindir}/init.lxc
 %attr(755,root,root) %{_libdir}/liblxc.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblxc.so.1
 %attr(754,root,root) /etc/rc.d/init.d/lxc
@@ -203,15 +222,16 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/rootfs
 %{_libdir}/%{name}/rootfs/README
 %attr(755,root,root) %{_libdir}/%{name}/lxc-devsetup
-%attr(755,root,root) %{_libdir}/%{name}/lxc-init
 %attr(755,root,root) %{_libdir}/%{name}/lxc-monitord
 %attr(755,root,root) %{_libdir}/%{name}/lxc-user-nic
+%attr(755,root,root) %{_libdir}/%{name}/lxc-autostart-helper
 %dir %{_sysconfdir}/lxc
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lxc/default.conf
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/lxc.functions
 %dir %{_datadir}/%{name}/config
 %{_datadir}/%{name}/config/centos.*.conf
+%{_datadir}/%{name}/config/common.seccomp
 %{_datadir}/%{name}/config/debian.*.conf
 %{_datadir}/%{name}/config/fedora.*.conf
 %{_datadir}/%{name}/config/gentoo.*.conf
@@ -263,6 +283,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_mandir}/ja/man1/lxc-start-ephemeral.1*
 %exclude %{_mandir}/ja/man1/lxc-top.1*
 
+
 %if %{without python}
 # legacy version
 %attr(755,root,root) %{_bindir}/lxc-ls
@@ -270,6 +291,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %dir %{configpath}
+%dir %{configpath}snap
 %dir %attr(750,root,root) /var/log/lxc
 %dir %attr(750,root,root) /var/cache/lxc