From 6b506e1a12b8f353aba978f08a8a129313272a99 Mon Sep 17 00:00:00 2001 From: Silas Sewell Date: Mon, 26 Jul 2010 17:05:45 +0000 Subject: [PATCH] - Update to 0.7.2 - Remove templates --- .cvsignore | 2 +- import.log | 1 + lxc-0.6.5-fix-sys-stat.patch | 11 ----------- lxc.spec | 21 +++++++++++++++------ sources | 2 +- 5 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 lxc-0.6.5-fix-sys-stat.patch diff --git a/.cvsignore b/.cvsignore index 3eb10b5..45aa829 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lxc-0.6.5.tar.gz +lxc-0.7.2.tar.gz diff --git a/import.log b/import.log index e225d01..a25de3e 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ 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 lxc-0_6_5-1_fc13:HEAD:lxc-0.6.5-1.fc13.src.rpm:1266448054 +lxc-0_7_2-1_fc14:HEAD:lxc-0.7.2-1.fc14.src.rpm:1280163913 diff --git a/lxc-0.6.5-fix-sys-stat.patch b/lxc-0.6.5-fix-sys-stat.patch deleted file mode 100644 index 68f6732..0000000 --- a/lxc-0.6.5-fix-sys-stat.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up lxc-0.6.5/src/lxc/start.c.orig lxc-0.6.5/src/lxc/start.c ---- lxc-0.6.5/src/lxc/start.c.orig 2010-02-17 15:04:08.911409808 -0700 -+++ lxc-0.6.5/src/lxc/start.c 2010-02-17 15:04:25.480347046 -0700 -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/lxc.spec b/lxc.spec index fc3547e..c132d7b 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,5 +1,5 @@ Name: lxc -Version: 0.6.5 +Version: 0.7.2 Release: 1%{?dist} Summary: Linux Resource Containers @@ -7,8 +7,6 @@ Group: Applications/System License: LGPLv2+ URL: http://lxc.sourceforge.net Source0: http://lxc.sourceforge.net/download/lxc/%{name}-%{version}.tar.gz -# Patch submitted in bug ID #2954017 -Patch0: lxc-0.6.5-fix-sys-stat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake @@ -55,7 +53,6 @@ This package contains documentation for %{name}. %prep %setup -q -%patch0 -p1 %build ./autogen.sh @@ -64,11 +61,16 @@ This package contains documentation for %{name}. %{__sed} -i '/AM_LDFLAGS = -Wl,-E -Wl,-rpath -Wl,$(libdir)/d' src/lxc/Makefile.in %{__make} %{?_smp_mflags} +%check +%{__make} check + %install -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %{__make} DESTDIR=%{buildroot} install find %{buildroot} -name '*.la' -delete %{__mkdir} -p %{buildroot}%{_sharedstatedir}/%{name} +# Remove templates +rm -f %{buildroot}%{_libdir}/lxc/templates/lxc-* %clean %{__rm} -rf %{buildroot} @@ -81,7 +83,6 @@ find %{buildroot} -name '*.la' -delete %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/%{name}-* -%{_libexecdir}/%{name}-init %{_mandir}/man*/%{name}* %{_sharedstatedir}/%{name} @@ -89,6 +90,7 @@ find %{buildroot} -name '*.la' -delete %defattr(-,root,root,-) %doc COPYING %{_libdir}/liblxc.so.* +%{_libdir}/lxc %files devel %defattr(-,root,root,-) @@ -102,6 +104,13 @@ find %{buildroot} -name '*.la' -delete %{_docdir}/%{name} %changelog +* Mon Jul 26 2010 Silas Sewell - 0.7.2-1 +- Update to 0.7.2 +- Remove templates + +* Tue Jul 06 2010 Silas Sewell - 0.7.1-1 +- Update to 0.7.1 + * Wed Feb 17 2010 Silas Sewell - 0.6.5-1 - Update to latest release - Add /var/lib/lxc directory diff --git a/sources b/sources index 267d428..337e2df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d648bcf82541c0da6725da502ee1d111 lxc-0.6.5.tar.gz +5c9c6889ba1255217078ea5d1aaf0c82 lxc-0.7.2.tar.gz