[schroot] - New upstream release 1.4.25 - Additional BR to resolve BZ 811856 - Unit tests enabled, patch relat

[Zach Carter]

commit ca1fc3c175f794ba94e7f6a9bc7531b4ec4dc2c5
Author: Zach Carter <z.carter at f5.com>
Date:   Thu Apr 12 09:29:03 2012 -0700

    - New upstream release 1.4.25
    - Additional BR to resolve BZ 811856
    - Unit tests enabled, patch related to /bin -> /usr/bin change.

 .gitignore                          |    1 +
 schroot-test-sbuild-util-path.patch |   13 +++++++++++++
 schroot.spec                        |   21 +++++++++++++++++----
 sources                             |    2 +-
 4 files changed, 32 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d2733aa..97a9a53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ schroot_1.4.2.orig.tar.gz
 /schroot_1.4.19.orig.tar.bz2
 /schroot_1.4.21.orig.tar.bz2
 /schroot_1.4.23.orig.tar.bz2
+/schroot_1.4.25.orig.tar.bz2
diff --git a/schroot-test-sbuild-util-path.patch b/schroot-test-sbuild-util-path.patch
new file mode 100644
index 0000000..2c24a65
--- /dev/null
+++ b/schroot-test-sbuild-util-path.patch
@@ -0,0 +1,13 @@
+--- test/sbuild-util.cc.orig	2012-04-12 09:16:48.117457863 -0700
++++ test/sbuild-util.cc	2012-04-12 09:17:02.579279315 -0700
+@@ -85,8 +85,8 @@
+   void test_find_program_in_path()
+   {
+     std::string path("/usr/local/bin:/usr/bin:/bin");
+-    CPPUNIT_ASSERT(sbuild::find_program_in_path("sh", path, "") == "/bin/sh");
+-    CPPUNIT_ASSERT(sbuild::find_program_in_path("sed", path, "") == "/bin/sed");
++    CPPUNIT_ASSERT(sbuild::find_program_in_path("sh", path, "") == "/usr/bin/sh");
++    CPPUNIT_ASSERT(sbuild::find_program_in_path("sed", path, "") == "/usr/bin/sed");
+   }
+ 
+ };
diff --git a/schroot.spec b/schroot.spec
index dbe8e46..9ee8296 100644
--- a/schroot.spec
+++ b/schroot.spec
@@ -1,6 +1,6 @@
 Name: schroot
-Version: 1.4.23
-Release: 5%{?dist}
+Version: 1.4.25
+Release: 1%{?dist}
 Summary: Execute commands in a chroot environment
 Group: Development/Tools
 License: GPLv3+
@@ -8,13 +8,18 @@ Url: http://packages.debian.org/schroot
 Source0: http://ftp.de.debian.org/debian/pool/main/s/schroot/%{name}_%{version}.orig.tar.bz2
 Patch0: schroot-pam.patch
 Patch1: schroot-default-config-path.patch
-Patch2: schroot-1.4.23-gcc47.patch
+Patch2: schroot-test-sbuild-util-path.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel
 BuildRequires: boost-devel
 BuildRequires: lockdev-devel
 BuildRequires: gettext
 BuildRequires: libuuid-devel
+BuildRequires: lvm2
+BuildRequires: btrfs-progs
+BuildRequires: debootstrap
+BuildRequires: cppunit-devel
+BuildRequires: fakeroot
 
 %description
 schroot allows users to execute commands or interactive shells in
@@ -57,7 +62,7 @@ functionality is available in the next generation tool called schroot.
 
 %patch0 -p0
 %patch1 -p0
-%patch2 -p1
+%patch2 -p0
 
 %build
 
@@ -84,6 +89,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/schroot-sbuild
 
 %find_lang %{name}
 
+%check
+fakeroot make check
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -142,6 +150,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING ABOUT-NLS AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS TODO
 
 %changelog
+* Thu Apr 12 2012 Zach Carter <z.carter at f5.com> - 1.4.25-1
+- New upstream version (removes need for gcc47-patch)
+- Add BR to enable unit tests, lvm snapshot, btrfs snapshot support (BZ 811856)
+- Add schroot-test-sbuild-util-path.patch
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.23-5
 - Rebuilt for c++ ABI breakage
 
diff --git a/sources b/sources
index 42bf99b..c68c40b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-73873e0fee83a45655ed8efa246a1e26  schroot_1.4.23.orig.tar.bz2
+c9e5056becd82b6330ac4502f59260f1  schroot_1.4.25.orig.tar.bz2