From c3b47dbd1e3ea5f0cf07facb787be35b69c005fb Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Fri, 15 Feb 2013 21:37:35 +0100
Subject: [PATCH] Update to 0.8.0.

- Modernize spec file.
- Include more templates.
---
 .gitignore |  1 +
 lxc.spec   | 89 +++++++++++++++++++++++++++++++++---------------------
 sources    |  2 +-
 3 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2f380e4..dcabd0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ lxc-0.7.2.tar.gz
 /lxc-0.7.4.1.tar.gz
 /lxc-0.7.4.2.tar.gz
 /lxc-0.7.5.tar.gz
+/lxc-0.8.0.tar.gz
diff --git a/lxc.spec b/lxc.spec
index ff44470..e680941 100644
--- a/lxc.spec
+++ b/lxc.spec
@@ -1,14 +1,11 @@
 Name:           lxc
-Version:        0.7.5
-Release:        3%{?dist}
+Version:        0.8.0
+Release:        1%{?dist}
 Summary:        Linux Resource Containers
-
 Group:          Applications/System
 License:        LGPLv2+
 URL:            http://lxc.sourceforge.net
 Source0:        http://lxc.sourceforge.net/download/lxc/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  docbook-utils
 BuildRequires:  kernel-headers
 BuildRequires:  libcap-devel
@@ -18,6 +15,7 @@ BuildRequires:  libtool
 Linux Resource Containers provide process and resource isolation without the
 overhead of full virtualization.
 
+
 %package        libs
 Summary:        Runtime library files for %{name}
 Group:          System Environment/Libraries
@@ -29,11 +27,20 @@ overhead of full virtualization.
 
 The %{name}-libs package contains libraries for running %{name} applications.
 
+
 %package        templates
 Summary:        Templates for %{name}
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
+# needed for lxc-busybox
+Requires:       busybox
+# needed for lxc-debian
+Requires:       dpkg
+# needed for lxc-debian, lxc-ubuntu:
 Requires:       debootstrap
+# needed for lxc-sshd
+Requires:       openssh-server dhclient
+
 
 %description    templates
 Linux Resource Containers provide process and resource isolation without the
@@ -41,6 +48,7 @@ overhead of full virtualization.
 
 The %{name}-template package contains templates for creating containers.
 
+
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
@@ -54,6 +62,7 @@ overhead of full virtualization.
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+
 %package        doc
 Summary:        Documentation for %{name}
 Group:          Documentation
@@ -62,70 +71,80 @@ Requires:       %{name} = %{version}-%{release}
 %description    doc
 This package contains documentation for %{name}.
 
+
 %prep
 %setup -q
 
+
 %build
-# Fix binary-or-shlib-defines-rpath error
-sed -i '/AM_LDFLAGS = -Wl,-E -Wl,-rpath -Wl,$(libdir)/d' src/lxc/Makefile.in
-# We know the exact location of asm/unistd.h
-sed -i 's,\$(LINUX_DIR)/arch/\$(LINUX_SRCARCH),/usr,' src/lxc/Makefile.in
-%configure  --disable-rpath F77=no
+%configure --enable-doc --disable-rpath --disable-apparmor
 make %{?_smp_mflags}
 
+
+%install
+%{make_install}
+make DESTDIR=%{buildroot} install
+mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
+
+
 %check
 make check
 
-%install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
-find %{buildroot} -name '*.la' -delete
-mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
-
-find %{buildroot}%{_libdir}/lxc/templates \
-  -type f \
-  -not -name lxc-maverick \
-  -not -name lxc-sshd \
-  -delete
-
-%clean
-rm -rf %{buildroot}
 
 %post libs -p /sbin/ldconfig
 
+
 %postun libs -p /sbin/ldconfig
 
+
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_bindir}/%{name}-*
 %{_mandir}/man*/%{name}*
 %{_sharedstatedir}/%{name}
 
+
 %files libs
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%dir %{_libdir}/lxc
-%dir %{_libdir}/lxc/templates
+%dir %{_datadir}/lxc
+%dir %{_datadir}/lxc/templates
 %{_libdir}/liblxc.so.*
-%{_libdir}/lxc/lxc-init
+%dir %{_libdir}/lxc
 %{_libdir}/lxc/rootfs
+%dir %{_libexecdir}/lxc
+%{_libexecdir}/lxc/lxc-init
+
 
 %files templates
-%defattr(-,root,root,-)
-%{_libdir}/lxc/templates/lxc-*
+%{_datadir}/lxc/templates/lxc-*
+# needs apt
+%exclude %{_datadir}/lxc/templates/lxc-altlinux
+# needs pacman
+%exclude %{_datadir}/lxc/templates/lxc-archlinux
+# probably outdated
+%exclude %{_datadir}/lxc/templates/lxc-lenny
+# needs zypper
+%exclude %{_datadir}/lxc/templates/lxc-opensuse
+# needs ubuntu-cloudimg-query
+%exclude %{_datadir}/lxc/templates/lxc-ubuntu-cloud
+
 
 %files devel
-%defattr(-,root,root,-)
-%{_datadir}/pkgconfig/%{name}.pc
-%{_includedir}/*
+%{_libdir}/pkgconfig/%{name}.pc
+%{_includedir}/lxc
 %{_libdir}/liblxc.so
 
+
 %files doc
-%defattr(-,root,root,-)
 %{_docdir}/%{name}
 
+
 %changelog
+* Fri Feb 15 2013 Thomas Moschny <thomas.moschny@gmx.de> - 0.8.0-1
+- Update to 0.8.0.
+- Modernize spec file.
+- Include more templates.
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 63e7057..64e11a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04949900ff56898f4353b130929c09d1  lxc-0.7.5.tar.gz
+7304fa57146ce687f749b5df876bb20d  lxc-0.8.0.tar.gz