From cdfe863a5e828c3bdba423a5e1825a3f4a5c35fb Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Mon, 26 Mar 2012 17:23:35 +0200
Subject: [PATCH] Update to upstream 0.7.5

- No need to run autogen.sh
- Fix: kernel header asm/unistd.h was not found
- Specfile cleanups
---
 .gitignore |  1 +
 lxc.spec   | 28 +++++++++++++++++-----------
 sources    |  2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 42930ff..2f380e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,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
diff --git a/lxc.spec b/lxc.spec
index 23b07a5..2919dee 100644
--- a/lxc.spec
+++ b/lxc.spec
@@ -1,6 +1,6 @@
 Name:           lxc
-Version:        0.7.4.2
-Release:        2%{?dist}
+Version:        0.7.5
+Release:        1%{?dist}
 Summary:        Linux Resource Containers
 
 Group:          Applications/System
@@ -9,7 +9,6 @@ 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:  automake
 BuildRequires:  docbook-utils
 BuildRequires:  kernel-headers
 BuildRequires:  libcap-devel
@@ -67,20 +66,21 @@ This package contains documentation for %{name}.
 %setup -q
 
 %build
-./autogen.sh
-%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}
+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
+make %{?_smp_mflags}
 
 %check
-%{__make} check
+make check
 
 %install
 rm -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install
 find %{buildroot} -name '*.la' -delete
-%{__mkdir} -p %{buildroot}%{_sharedstatedir}/%{name}
+mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
 
 find %{buildroot}%{_libdir}/lxc/templates \
   -type f \
@@ -89,7 +89,7 @@ find %{buildroot}%{_libdir}/lxc/templates \
   -delete
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %post libs -p /sbin/ldconfig
 
@@ -126,6 +126,12 @@ find %{buildroot}%{_libdir}/lxc/templates \
 %{_docdir}/%{name}
 
 %changelog
+* Mon Mar 26 2012 Thomas Moschny <thomas.moschny@gmx.de> - 0.7.5-1
+- Update to upstream 0.7.5
+- No need to run autogen.sh
+- Fix: kernel header asm/unistd.h was not found
+- Specfile cleanups
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.4.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 56a49c8..63e7057 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36fcb0f6a39d2f55130421f342f24ef3  lxc-0.7.4.2.tar.gz
+04949900ff56898f4353b130929c09d1  lxc-0.7.5.tar.gz