- Added patch to remove test for specific version of automake.
This commit is contained in:
parent
b318423829
commit
775917491f
|
@ -0,0 +1,25 @@
|
||||||
|
diff -ur fakechroot-2.9/autogen.sh fakechroot-2.9-no-automake-version/autogen.sh
|
||||||
|
--- fakechroot-2.9/autogen.sh 2009-03-19 14:43:19.000000000 +0000
|
||||||
|
+++ fakechroot-2.9-no-automake-version/autogen.sh 2009-06-12 10:03:49.897687490 +0100
|
||||||
|
@@ -5,18 +5,16 @@
|
||||||
|
set -e
|
||||||
|
|
||||||
|
autogen () {
|
||||||
|
- automake_version=1.10
|
||||||
|
-
|
||||||
|
rm -f Makefile Makefile.in aclocal.m4
|
||||||
|
rm -f config.guess config.h config.h.in config.log
|
||||||
|
rm -f config.status config.sub configure
|
||||||
|
rm -f depcomp install-sh libtool ltmain.sh missing stamp-h1
|
||||||
|
rm -rf autom4te.cache
|
||||||
|
|
||||||
|
- aclocal-${automake_version} "$@"
|
||||||
|
+ aclocal "$@"
|
||||||
|
autoheader
|
||||||
|
libtoolize --force --copy
|
||||||
|
- automake-${automake_version} --add-missing --copy
|
||||||
|
+ automake --add-missing --copy
|
||||||
|
autoconf
|
||||||
|
|
||||||
|
rm -rf autom4te.cache
|
||||||
|
Only in fakechroot-2.9-no-automake-version: autogen.sh~
|
|
@ -1,7 +1,7 @@
|
||||||
Summary: Gives a fake chroot environment
|
Summary: Gives a fake chroot environment
|
||||||
Name: fakechroot
|
Name: fakechroot
|
||||||
Version: 2.9
|
Version: 2.9
|
||||||
Release: 22%{?dist}
|
Release: 23%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
URL: http://fakechroot.alioth.debian.org/
|
URL: http://fakechroot.alioth.debian.org/
|
||||||
|
@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||||
Requires: fakechroot-libs = %{version}-%{release}
|
Requires: fakechroot-libs = %{version}-%{release}
|
||||||
|
|
||||||
# Required for patch0:
|
# Required for patch0:
|
||||||
BuildRequires: autoconf, automake, libtool
|
BuildRequires: autoconf, automake >= 1.10, libtool
|
||||||
|
|
||||||
# Fix build problems with recent glibc. Sent upstream 20090414.
|
# Fix build problems with recent glibc. Sent upstream 20090414.
|
||||||
Patch0: fakechroot-scandir.patch
|
Patch0: fakechroot-scandir.patch
|
||||||
|
@ -19,6 +19,11 @@ Patch0: fakechroot-scandir.patch
|
||||||
# Sent upstream 20090413. Accepted upstream 20090418.
|
# Sent upstream 20090413. Accepted upstream 20090418.
|
||||||
Patch1: fakechroot-cmd-subst.patch
|
Patch1: fakechroot-cmd-subst.patch
|
||||||
|
|
||||||
|
# autogen script depends on a specific automake version, for no
|
||||||
|
# real reason AFAICT. This means the package breaks everytime
|
||||||
|
# a new version of automake is released. - RWMJ.
|
||||||
|
Patch2: fakechroot-no-automake-version.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
fakechroot runs a command in an environment were is additionally
|
fakechroot runs a command in an environment were is additionally
|
||||||
possible to use the chroot(8) call without root privileges. This is
|
possible to use the chroot(8) call without root privileges. This is
|
||||||
|
@ -38,6 +43,7 @@ This package contains the libraries required by %{name}.
|
||||||
|
|
||||||
%patch0 -p0
|
%patch0 -p0
|
||||||
%patch1 -p0
|
%patch1 -p0
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
# Patch0 updates autoconf, so rerun this:
|
# Patch0 updates autoconf, so rerun this:
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
|
@ -70,6 +76,9 @@ rm -rf %{buildroot}
|
||||||
%{_libdir}/fakechroot/libfakechroot.so
|
%{_libdir}/fakechroot/libfakechroot.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 12 2009 Richard W.M. Jones <rjones@redhat.com> - 2.9-23
|
||||||
|
- Added patch to remove test for specific version of automake.
|
||||||
|
|
||||||
* Sat Apr 18 2009 Richard W.M. Jones <rjones@redhat.com> - 2.9-22
|
* Sat Apr 18 2009 Richard W.M. Jones <rjones@redhat.com> - 2.9-22
|
||||||
- FAKECHROOT_CMD_SUBST patch has now been accepted upstream.
|
- FAKECHROOT_CMD_SUBST patch has now been accepted upstream.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue