- 0.6.2

Changed files:
    lxc-ldflags.patch -> 1.1
    lxc.spec -> 1.4

diff --git a/lxc-ldflags.patch b/lxc-ldflags.patch
new file mode 100644 (file)
index 0000000..22b6722
--- /dev/null
+++ b/lxc-ldflags.patch
@@ -0,0 +1,12 @@
+diff -Nur lxc-0.6.2.orig/src/lxc/Makefile.am lxc-0.6.2.ldflags/src/lxc/Makefile.am
+--- lxc-0.6.2.orig/src/lxc/Makefile.am 2009-04-24 03:43:33.000000000 -0600
++++ lxc-0.6.2.ldflags/src/lxc/Makefile.am      2009-05-03 14:50:02.000000000 -0600
+@@ -1,7 +1,7 @@
+ INCLUDES= -I$(top_srcdir)/src -DLXCPATH="\"@LXCPATH@\"" \
+         -DLXCBINDIR="\"$(bindir)\"" \
+         -DLXCLIBEXECDIR="\"$(libexecdir)\""
+-AM_LDFLAGS= -lutil
++LDFLAGS= -lutil
+ lib_LTLIBRARIES = liblxc.la
+ pkginclude_HEADERS = \
+               error.h \

diff --git a/lxc.spec b/lxc.spec
index 1a13024475635ce1128273a8c7c07c8dacf5fc0a..da421fe8d466d1bdb227df6db616f88ad8b93a08 100644 (file)
--- a/lxc.spec
+++ b/lxc.spec
@@ -1,12 +1,13 @@
 # TODO: FHS (/var/lxc -> /var/lib/lxc)
 Summary:       Linux Container Tools
 Name:          lxc
-Version:       0.4.0
+Version:       0.6.2
 Release:       1
 License:       GPL
 Group:         Base
 Source0:       http://dl.sourceforge.net/lxc/%{name}-%{version}.tar.gz
-# Source0-md5: 327f0e700858ab5b916aa36517680256
+# Source0-md5: eb4e14c2d58663f5ebcd6cd3d6a61fe6
+Patch0:                %{name}-ldflags.patch
 URL:           http://sourceforge.net/projects/lxc
 BuildRequires: autoconf
 BuildRequires: automake
@@ -41,11 +42,12 @@ Static lxc library.
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i -e 's#^lxcpath=.*#lxcpath=/var/lxc#g' src/lxc/Makefile.am
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I config
 %{__autoconf}
 %{__automake}
 %configure
@@ -69,10 +71,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README etc/*.conf etc/*-config
+%dir %{_sysconfdir}/lxc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lxc/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/liblxc-*.so
+%{_mandir}/*/**
 %dir %{_sysconfdir}/lxc
 %dir /var/lxc
+%attr(755,root,root) %{_libdir}/lxc-init
 
 %files devel
 %defattr(644,root,root,755)