[febootstrap/el5] New upstream version 3.18.

[Richard W.M. Jones]

commit 700a3baa6d27224cb8d2e7fb46c3fc8d65c0a9ad
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Jun 18 22:00:39 2012 +0100

    New upstream version 3.18.
    
    - This adds support for EPEL 5.

 .gitignore                                         |    3 +-
 ...EL-5-configure-Ignore-missing-AC_PROG_SED.patch |   30 -----------
 ...d-Remove-a-few-C99-isms-that-confused-old.patch |   54 --------------------
 febootstrap.spec                                   |   24 ++++++---
 sources                                            |    2 +-
 5 files changed, 17 insertions(+), 96 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 42111b7..757c233 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-febootstrap-2.7.tar.gz
-/febootstrap-2.10.tar.gz
+/febootstrap-*.tar.gz
diff --git a/febootstrap.spec b/febootstrap.spec
index c2a2189..28ed02d 100644
--- a/febootstrap.spec
+++ b/febootstrap.spec
@@ -1,17 +1,13 @@
 Summary:     Bootstrapping tool for creating supermin appliances
 Name:        febootstrap
-Version:     3.14
-Release:     3%{?dist}
+Version:     3.18
+Release:     1%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
 URL:         http://people.redhat.com/~rjones/febootstrap/
 Source0:     http://people.redhat.com/~rjones/febootstrap/files/%{name}-%{version}.tar.gz
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: autoconf, automake, libtool, pkgconfig
-Patch0001:   0001-RHEL-5-configure-Ignore-missing-AC_PROG_SED.patch
-Patch0002:   0002-RHEL-5-build-Remove-a-few-C99-isms-that-confused-old.patch
-
 BuildRequires: /usr/bin/pod2man
 BuildRequires: yum >= 3.2
 BuildRequires: /sbin/mke2fs
@@ -56,12 +52,16 @@ Requires:    e2fsprogs-libs
 
 %prep
 %setup -q
-%patch0001 -p1
-%patch0002 -p1
-AUTOMAKE="automake --add-missing --foreign" autoreconf -i
 
 
 %build
+# By setting these variables, we prevent pkg-config from trying to
+# find ext2fs.pc and com_err.pc files which don't exist in RHEL 5.
+export EXT2FS_CFLAGS="-I /usr/include/ext2fs"
+export EXT2FS_LIBS="-lext2fs"
+export COM_ERR_CFLAGS="-I /usr/include/et"
+export COM_ERR_LIBS="-lcom_err"
+
 %configure
 make
 
@@ -97,6 +97,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 18 2012 Richard Jones <rjones at redhat.com> - 3.18-1
+- New upstream version 3.18.
+- This adds support for EPEL 5.
+- Remove patches which are now upstream.
+- Override pkg-config for RHEL 5 packages which didn't have pkg-config data.
+
 * Fri Mar 30 2012 Richard Jones <rjones at redhat.com> - 3.14-3
 - New upstream version 3.14.
 - Import from Rawhide into EPEL 5.
diff --git a/sources b/sources
index a7d29c3..56b48f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62dfef6abac5e9fe75d56c5a871be500  febootstrap-3.14.tar.gz
+d225974892a13d281a0ee852cf7d7077  febootstrap-3.18.tar.gz