From a7b770e515cd3e818958dde0c361318809d87c38 Mon Sep 17 00:00:00 2001
From: Silas Sewell <silas@fedoraproject.org>
Date: Fri, 27 Nov 2009 22:42:04 +0000
Subject: - Update to latest release - Add documentation sub-package

---
 .cvsignore                  |  2 +-
 import.log                  |  1 +
 lxc-0.6.3.netlink-fix.patch | 19 -------------------
 lxc.spec                    | 35 ++++++++++++++++++++++++-----------
 sources                     |  2 +-
 5 files changed, 27 insertions(+), 32 deletions(-)
 delete mode 100644 lxc-0.6.3.netlink-fix.patch

diff --git a/.cvsignore b/.cvsignore
index 0836f7e..de99651 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lxc-0.6.3.tar.gz
+lxc-0.6.4.tar.gz
diff --git a/import.log b/import.log
index d0c17ff..7f0fbf2 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 lxc-0_6_3-2_fc11:HEAD:lxc-0.6.3-2.fc11.src.rpm:1248764868
+lxc-0_6_4-1_fc13:HEAD:lxc-0.6.4-1.fc13.src.rpm:1259360737
diff --git a/lxc-0.6.3.netlink-fix.patch b/lxc-0.6.3.netlink-fix.patch
deleted file mode 100644
index e2beceb..0000000
--- a/lxc-0.6.3.netlink-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up lxc-0.6.3/configure.ac.orig lxc-0.6.3/configure.ac
---- lxc-0.6.3/configure.ac.orig	2009-07-28 00:59:14.737542987 -0400
-+++ lxc-0.6.3/configure.ac	2009-07-28 01:03:22.907540449 -0400
-@@ -25,10 +25,11 @@ AS_AC_EXPAND(LOCALSTATEDIR, $localstated
- AS_AC_EXPAND(LXCPATH, "${localstatedir}/lib/lxc")
- AS_AC_EXPAND(LXC_GENERATE_DATE, "$(date)")
- 
--AC_CHECK_HEADERS([linux/netlink.h linux/genetlink.h], [], AC_MSG_ERROR([netlink headers not found. Please install the linux kernel headers.]),
--[#include <linux/types.h>
--#include <bits/sockaddr.h>
--#include <linux/socket.h>])
-+AC_CHECK_HEADERS([linux/netlink.h linux/genetlink.h],
-+                 [],
-+                 AC_MSG_ERROR([netlink headers not found. Please install the linux kernel headers.]),
-+                 [#include <sys/socket.h>
-+    ])
- 
- AC_CHECK_HEADERS([sys/capability.h], [], AC_MSG_ERROR([please install libcap-devel.]),
- [#include <sys/types.h>
diff --git a/lxc.spec b/lxc.spec
index 433bb60..31663a7 100644
--- a/lxc.spec
+++ b/lxc.spec
@@ -1,14 +1,12 @@
 Name:           lxc
-Version:        0.6.3
-Release:        2%{?dist}
+Version:        0.6.4
+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
-# Upstream commit 90e0a869ac5f3a889487126568f1d3c7c34b7046
-Patch0:         lxc-0.6.3.netlink-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  automake
@@ -45,13 +43,22 @@ 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
+Requires:       %{name} = %{version}-%{release}
+
+%description    doc
+This package contains documentation for %{name}. 
+
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 ./autogen.sh
-%configure F77=no --enable-static=no
+%configure F77=no
+# Fix binary-or-shlib-defines-rpath error
+%{__sed} -i '/AM_LDFLAGS = -Wl,-E -Wl,-rpath -Wl,$(libdir)/d' src/lxc/Makefile.in
 %{__make} %{?_smp_mflags}
 
 %install
@@ -69,8 +76,6 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%dir %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/*
 %{_bindir}/%{name}-*
 %{_libexecdir}/%{name}-init
 %{_mandir}/man*/%{name}*
@@ -78,7 +83,7 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-,root,root,-)
 %doc COPYING
-%{_libdir}/liblxc-%{version}.so
+%{_libdir}/liblxc.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -87,9 +92,17 @@ rm -rf %{buildroot}
 %{_includedir}/*
 %{_libdir}/liblxc.so
 
+%files doc
+%defattr(-,root,root,-)
+%{_docdir}/%{name}
+
 %changelog
+* Fri Nov 27 2009 Silas Sewell <silas@sewell.ch> - 0.6.4-1
+- Update to latest release
+- Add documentation sub-package
+
 * Mon Jul 27 2009 Silas Sewell <silas@sewell.ch> - 0.6.3-2
-- Apply patch for rawhide kernel.
+- Apply patch for rawhide kernel
 
 * Sat Jul 25 2009 Silas Sewell <silas@sewell.ch> - 0.6.3-1
-- Initial package.
+- Initial package
diff --git a/sources b/sources
index 3e666ac..6247002 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-417bb6dd61ba0c65996df5c3adbb549f  lxc-0.6.3.tar.gz
+6c769cc9c24f93f499c31564dc314047  lxc-0.6.4.tar.gz
-- 
cgit