[schroot] Update to upstream 1.4.10

[Zach Carter]

commit 87f8841c1760a62cdfc2bf15921b140655126888
Author: Zach Carter <z.carter at f5.com>
Date:   Mon Aug 23 10:09:02 2010 -0700

    Update to upstream 1.4.10

 schroot-default-config-path.patch |   17 +++++++++--------
 schroot.spec                      |   23 +++++++++++++++++++----
 2 files changed, 28 insertions(+), 12 deletions(-)
---
diff --git a/schroot-default-config-path.patch b/schroot-default-config-path.patch
index 4d5c49e..2913a28 100644
--- a/schroot-default-config-path.patch
+++ b/schroot-default-config-path.patch
@@ -1,11 +1,12 @@
---- ./etc/default/generic/config.orig	2010-05-27 13:55:05.000000000 -0700
-+++ ./etc/default/generic/config	2010-05-27 13:55:23.000000000 -0700
-@@ -1,6 +1,8 @@
- # Default settings for chroot setup and exec scripts.
- # See schroot-script-config(5) for further details.
+--- etc/setup.d/common-data.orig	2010-08-23 09:54:15.000000000 -0700
++++ etc/setup.d/common-data	2010-08-23 09:52:22.000000000 -0700
+@@ -18,6 +18,9 @@
  
+ # Common data for use in schroot setup scripts
+ 
++# Make sure /sbin directories are in the path
 +PATH=$PATH:/sbin:/usr/sbin
 +
- # Filesystems to mount inside the chroot.
- FSTAB="/etc/schroot/default/fstab"
- 
+ # Script arguments
+ STAGE="$1"
+ STATUS="$2"
diff --git a/schroot.spec b/schroot.spec
index 9e7178b..1283caa 100644
--- a/schroot.spec
+++ b/schroot.spec
@@ -1,6 +1,6 @@
 Name: schroot
-Version: 1.4.2
-Release: 6%{?dist}
+Version: 1.4.10
+Release: 1%{?dist}
 Summary: Execute commands in a chroot environment
 Group: Development/Tools
 License: GPLv3+
@@ -8,7 +8,6 @@ Url: http://packages.debian.org/schroot
 Source0: http://ftp.de.debian.org/debian/pool/main/s/schroot/%{name}_%{version}.orig.tar.gz
 Patch0: schroot-pam.patch
 Patch1: schroot-default-config-path.patch
-Patch2: schroot-configure-boost-variables-map.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel
 BuildRequires: boost-devel
@@ -57,7 +56,6 @@ functionality is available in the next generation tool called schroot.
 
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
 
 %build
 
@@ -78,6 +76,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libsbuild.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libsbuild.so*
 rm -f $RPM_BUILD_ROOT%{_libdir}/libsbuild.a
 
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/schroot/sbuild
+
 %find_lang %{name}
 
 %clean
@@ -96,7 +96,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/schroot/default/copyfiles
 %{_sysconfdir}/schroot/default/fstab
 %{_sysconfdir}/schroot/default/nssdatabases
+%{_sysconfdir}/schroot/desktop/config
+%{_sysconfdir}/schroot/desktop/copyfiles
+%{_sysconfdir}/schroot/desktop/fstab
+%{_sysconfdir}/schroot/desktop/nssdatabases
+%{_sysconfdir}/schroot/minimal/config
+%{_sysconfdir}/schroot/minimal/copyfiles
+%{_sysconfdir}/schroot/minimal/fstab
+%{_sysconfdir}/schroot/minimal/nssdatabases
 %{_sysconfdir}/schroot/setup.d/00check
+%{_sysconfdir}/schroot/setup.d/05btrfs
 %{_sysconfdir}/schroot/setup.d/05file
 %{_sysconfdir}/schroot/setup.d/05lvm
 %{_sysconfdir}/schroot/setup.d/05union
@@ -113,10 +122,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/lib/schroot
 %{_localstatedir}/lib/schroot/session
 %{_localstatedir}/lib/schroot/mount
+%{_datadir}/%{name}/setup/common-data
+%{_datadir}/%{name}/setup/common-functions
 %{_mandir}/man1/schroot.1.gz
 %{_mandir}/man5/schroot-script-config.5.gz
 %{_mandir}/man5/schroot-setup.5.gz
 %{_mandir}/man5/schroot.conf.5.gz
+%{_mandir}/man7/schroot-faq.7.gz
 %doc COPYING ABOUT-NLS AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS TODO
 
 %files -n dchroot
@@ -126,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING ABOUT-NLS AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS TODO
 
 %changelog
+* Mon Aug 16 2010 Zach Carter <z.carter at f5.com> - 1.4.10-1
+- update to 1.4.10
+
 * Fri Jul 30 2010 Zach Carter <z.carter at f5.com> - 1.4.2-6
 - rebuild for boost 1.44 update