summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Moschny <thm@fedoraproject.org>2012-03-26 17:23:35 +0200
committerThomas Moschny <thm@fedoraproject.org>2012-03-26 17:42:13 +0200
commit412e0861a26596d1dc9c135d7e5d0f3f3c12ff95 (patch)
tree0ffecc44c3863294489fb01287cdc04b3464b7a4
parentc5a38de6fa1ebc970bc13444f4377b84f70138a3 (diff)
downloadlxc-f15.tar.gz
lxc-f15.tar.xz
lxc-f15.zip
Update to upstream 0.7.5f15
- No need to run autogen.sh - Fix: kernel header asm/unistd.h was not found - Specfile cleanups
-rw-r--r--.gitignore1
-rw-r--r--lxc.spec26
-rw-r--r--sources2
3 files changed, 18 insertions, 11 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 bbc1803..181c945 100644
--- a/lxc.spec
+++ b/lxc.spec
@@ -1,5 +1,5 @@
Name: lxc
-Version: 0.7.4.2
+Version: 0.7.5
Release: 1%{?dist}
Summary: Linux Resource Containers
@@ -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
+
* Wed Jul 06 2011 Adam Miller <maxamillion@fedoraproject.org> - 0.7.4.2-1
- Update to upstream 0.7.4.2
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