up to 1.0.0-beta2 - added autostart scripts

diff --git a/lxc-pld.patch b/lxc-pld.patch
index 47fbd6110c046f69be5e7c0b3661a67f7b0e93b1..372600ed2423bba2397904ed0c700b2c629b98b3 100644 (file)
--- a/lxc-pld.patch
+++ b/lxc-pld.patch
@@ -1,29 +1,29 @@
---- lxc-lxc-1.0.0.alpha3/configure.ac~ 2013-11-15 23:08:17.000000000 +0200
-+++ lxc-lxc-1.0.0.alpha3/configure.ac  2013-11-20 01:01:35.253197161 +0200
-@@ -81,7 +81,7 @@
+--- lxc-lxc-1.0.0.beta2/configure.ac~  2014-01-16 02:07:33.000000000 +0200
++++ lxc-lxc-1.0.0.beta2/configure.ac   2014-02-13 10:09:36.273870378 +0200
+@@ -136,7 +136,7 @@
  
  if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
        db2xman=""
--      dbparsers="docbook2x-man db2x_docbook2man docbook2man"
-+      dbparsers="docbook2X2man docbook2x-man db2x_docbook2man docbook2man"
+-      dbparsers="docbook2x-man db2x_docbook2man docbook2man docbook-to-man"
++      dbparsers="docbook2X2man docbook2x-man db2x_docbook2man docbook2man docbook-to-man"
  
        AC_MSG_CHECKING(for docbook2x-man)
        for name in ${dbparsers}; do
-@@ -525,6 +525,7 @@
+@@ -650,6 +650,7 @@
        templates/lxc-opensuse
-       templates/lxc-busybox
-       templates/lxc-fedora
-+      templates/lxc-pld
-       templates/lxc-openmandriva
        templates/lxc-oracle
-       templates/lxc-altlinux
---- lxc-lxc-1.0.0.alpha3/templates/Makefile.am~        2013-11-15 23:08:17.000000000 +0200
-+++ lxc-lxc-1.0.0.alpha3/templates/Makefile.am 2013-11-20 01:04:32.994128379 +0200
-@@ -6,6 +6,7 @@
-       lxc-ubuntu-cloud \
+       templates/lxc-plamo
++      templates/lxc-pld
+       templates/lxc-sshd
+       templates/lxc-ubuntu
+       templates/lxc-ubuntu-cloud
+--- lxc-lxc-1.0.0.beta2/templates/Makefile.am~ 2014-01-16 02:07:33.000000000 +0200
++++ lxc-lxc-1.0.0.beta2/templates/Makefile.am  2014-02-13 10:10:14.378961481 +0200
+@@ -15,6 +15,7 @@
        lxc-opensuse \
-       lxc-fedora \
-+      lxc-pld \
-       lxc-openmandriva \
        lxc-oracle \
-       lxc-altlinux \
+       lxc-plamo \
++      lxc-pld \
+       lxc-sshd \
+       lxc-ubuntu \
+       lxc-ubuntu-cloud

diff --git a/lxc.spec b/lxc.spec
index 738f86c4c8c7fe6f227fbe2f9c28601b4ed34708..09be6616ee0e29f1f565725dfac39ba556fd7ea1 100644 (file)
--- a/lxc.spec
+++ b/lxc.spec
@@ -6,7 +6,7 @@
 %bcond_without python  # Python binding
 %bcond_with    selinux # SELinux
 
-%define                subver  beta1
+%define                subver  beta2
 %define                rel             0.1
 Summary:       Linux Containers userspace tools
 Summary(pl.UTF-8):     Narzędzia do kontenerów linuksowych (LXC)
@@ -16,7 +16,7 @@ Release:      0.%{subver}.%{rel}
 License:       LGPL v2.1+
 Group:         Applications/System
 Source0:       https://github.com/lxc/lxc/archive/%{name}-%{version}.%{subver}.tar.gz
-# Source0-md5: 82ddad563fe31b80595543d838788551
+# Source0-md5: cdb6b00594ae3423c0745e4e24d807c7
 Source1:       %{name}-pld.in.sh
 Patch1:                %{name}-pld.patch
 Patch4:                checkconfig-vserver-config.patch
@@ -26,6 +26,7 @@ BuildRequires:        automake
 BuildRequires: docbook-dtd30-sgml
 BuildRequires: docbook-utils
 BuildRequires: docbook2X
+BuildRequires: gnutls-devel
 %{?with_apparmor:BuildRequires:        libapparmor-devel}
 BuildRequires: libcap-devel
 %{?with_seccomp:BuildRequires: libseccomp-devel}
@@ -134,8 +135,9 @@ cp -p %{SOURCE1} templates/lxc-pld.in
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{configpath},/var/{cache,log}/lxc}
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       pcdatadir=%{_pkgconfigdir}
+       SYSTEMD_UNIT_DIR=%{systemdunitdir} \
+       pcdatadir=%{_pkgconfigdir} \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} -C doc install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -160,6 +162,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS CONTRIBUTING MAINTAINERS README TODO 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
 %attr(755,root,root) %{_bindir}/lxc-checkconfig
 %attr(755,root,root) %{_bindir}/lxc-checkpoint
@@ -188,23 +191,31 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/lxc-wait
 %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
+%{systemdunitdir}/lxc.service
 %dir %{_libdir}/lxc
 %dir %{_libdir}/lxc/rootfs
 %{_libdir}/lxc/rootfs/README
+%attr(755,root,root) %{_libdir}/lxc/lxc-devsetup
 %attr(755,root,root) %{_libdir}/lxc/lxc-init
 %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/debian*.conf
+%{_datadir}/%{name}/config/oracle*.conf
+%{_datadir}/%{name}/config/plamo*.conf
 %{_datadir}/%{name}/config/ubuntu*.conf
 %dir %{_datadir}/%{name}/hooks
 %dir %{_datadir}/%{name}/templates
-%attr(755,root,root) %{_datadir}/%{name}/hooks/mount*
 %attr(755,root,root) %{_datadir}/%{name}/hooks/clonehostname
+%attr(755,root,root) %{_datadir}/%{name}/hooks/mount*
+%attr(755,root,root) %{_datadir}/%{name}/hooks/squid-deb-proxy-client
 %attr(755,root,root) %{_datadir}/%{name}/hooks/ubuntu-cloud-prep
 %attr(755,root,root) %{_datadir}/%{name}/templates/lxc-*
 %{_mandir}/man1/lxc-attach.1*
+%{_mandir}/man1/lxc-autostart.1*
 %{_mandir}/man1/lxc-cgroup.1*
 %{_mandir}/man1/lxc-checkconfig.1*
 %{_mandir}/man1/lxc-checkpoint.1*
@@ -232,6 +243,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/lxc.conf.5*
 %{_mandir}/man7/lxc.7*
 %lang(ja) %{_mandir}/ja/man1/lxc*.1*
+%lang(ja) %{_mandir}/ja/man5/lxc-usernet.5*
 %lang(ja) %{_mandir}/ja/man5/lxc.conf.5*
 %lang(ja) %{_mandir}/ja/man7/lxc.7*
 %exclude %{_mandir}/ja/man1/lxc-device.1*