[schroot] Add schroot-1.4.23-gcc47.patch (Fix mass rebuild FTBFS).
corsepiu
corsepiu at fedoraproject.org
Tue Jan 17 15:49:27 UTC 2012
commit 2cb6e2677dbcca8899d69ac0107dd0a042858e8a
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date: Tue Jan 17 16:49:15 2012 +0100
Add schroot-1.4.23-gcc47.patch (Fix mass rebuild FTBFS).
schroot-1.4.23-gcc47.patch | 172 ++++++++++++++++++++++++++++++++++++++++++++
schroot.spec | 9 ++-
2 files changed, 179 insertions(+), 2 deletions(-)
---
diff --git a/schroot-1.4.23-gcc47.patch b/schroot-1.4.23-gcc47.patch
new file mode 100644
index 0000000..659bc1e
--- /dev/null
+++ b/schroot-1.4.23-gcc47.patch
@@ -0,0 +1,172 @@
+diff -Naur schroot-1.4.23.orig/sbuild/sbuild-custom-error.h schroot-1.4.23/sbuild/sbuild-custom-error.h
+--- schroot-1.4.23.orig/sbuild/sbuild-custom-error.h 2011-06-11 17:54:38.186135440 +0200
++++ schroot-1.4.23/sbuild/sbuild-custom-error.h 2012-01-17 16:25:31.343780636 +0100
+@@ -41,8 +41,8 @@
+ * @param error the error code.
+ */
+ custom_error (error_type error):
+- sbuild::error<T>(format_error(null(), null(), null(), error, null(), null(), null()),
+- format_reason(null(), null(), null(), error, null(), null(), null()))
++ sbuild::error<T>(this->format_error(null(), null(), null(), error, null(), null(), null()),
++ this->format_reason(null(), null(), null(), error, null(), null(), null()))
+ {
+ }
+
+@@ -55,8 +55,8 @@
+ template<typename C>
+ custom_error (C const& context,
+ error_type error):
+- sbuild::error<T>(format_error(context, null(), null(), error, null(), null(), null()),
+- format_reason(context, null(), null(), error, null(), null(), null()))
++ sbuild::error<T>(this->format_error(context, null(), null(), error, null(), null(), null()),
++ this->format_reason(context, null(), null(), error, null(), null(), null()))
+ {
+ }
+
+@@ -69,8 +69,8 @@
+ template<typename D>
+ custom_error (error_type error,
+ D const& detail):
+- sbuild::error<T>(format_error(null(), null(), null(), error, detail, null(), null()),
+- format_reason(null(), null(), null(), error, detail, null(), null()))
++ sbuild::error<T>(this->format_error(null(), null(), null(), error, detail, null(), null()),
++ this->format_reason(null(), null(), null(), error, detail, null(), null()))
+ {
+ }
+
+@@ -85,8 +85,8 @@
+ custom_error (error_type error,
+ D const& detail,
+ E const& detail2):
+- sbuild::error<T>(format_error(null(), null(), null(), error, detail, detail2, null()),
+- format_reason(null(), null(), null(), error, detail, detail2, null()))
++ sbuild::error<T>(this->format_error(null(), null(), null(), error, detail, detail2, null()),
++ this->format_reason(null(), null(), null(), error, detail, detail2, null()))
+ {
+ }
+
+@@ -103,8 +103,8 @@
+ D const& detail,
+ E const& detail2,
+ F const& detail3):
+- sbuild::error<T>(format_error(null(), null(), null(), error, detail, detail2, detail3),
+- format_reason(null(), null(), null(), error, detail, detail2, detail3))
++ sbuild::error<T>(this->format_error(null(), null(), null(), error, detail, detail2, detail3),
++ this->format_reason(null(), null(), null(), error, detail, detail2, detail3))
+ {
+ }
+
+@@ -119,8 +119,8 @@
+ custom_error (C const& context,
+ error_type error,
+ D const& detail):
+- sbuild::error<T>(format_error(context, null(), null(), error, detail, null(), null()),
+- format_reason(context, null(), null(), error, detail, null(), null()))
++ sbuild::error<T>(this->format_error(context, null(), null(), error, detail, null(), null()),
++ this->format_reason(context, null(), null(), error, detail, null(), null()))
+ {
+ }
+
+@@ -155,8 +155,8 @@
+ D const& context2,
+ error_type error,
+ E const& detail):
+- sbuild::error<T>(format_error(context1, context2, null(), error, detail, null(), null()),
+- format_reason(context1, context2, null(), error, detail, null(), null()))
++ sbuild::error<T>(this->format_error(context1, context2, null(), error, detail, null(), null()),
++ this->format_reason(context1, context2, null(), error, detail, null(), null()))
+ {
+ }
+
+diff -Naur schroot-1.4.23.orig/sbuild/sbuild-nostream.h schroot-1.4.23/sbuild/sbuild-nostream.h
+--- schroot-1.4.23.orig/sbuild/sbuild-nostream.h 2011-05-27 18:01:47.134846621 +0200
++++ schroot-1.4.23/sbuild/sbuild-nostream.h 2012-01-17 15:56:54.369906387 +0100
+@@ -58,7 +58,7 @@
+ std::basic_ios<cT, traits>(&nbuf),
+ std::basic_ostream<cT, traits>(&nbuf)
+ {
+- init(&nbuf);
++ this->init(&nbuf);
+ }
+
+ private:
+diff -Naur schroot-1.4.23.orig/sbuild/sbuild-parse-error.h schroot-1.4.23/sbuild/sbuild-parse-error.h
+--- schroot-1.4.23.orig/sbuild/sbuild-parse-error.h 2011-06-11 17:54:38.190135491 +0200
++++ schroot-1.4.23/sbuild/sbuild-parse-error.h 2012-01-17 15:48:44.742942465 +0100
+@@ -46,8 +46,8 @@
+ template<typename C>
+ parse_error (C const& context,
+ error_type error):
+- sbuild::error<T>(format_error(context, null(), null(), error, null(), null(), null()),
+- format_reason(context, null(), null(), error, null(), null(), null()))
++ sbuild::error<T>(this->format_error(context, null(), null(), error, null(), null(), null()),
++ this->format_reason(context, null(), null(), error, null(), null(), null()))
+ {
+ }
+
+@@ -60,8 +60,8 @@
+ template<typename D>
+ parse_error (error_type error,
+ D const& detail):
+- sbuild::error<T>(format_error(null(), null(), null(), error, detail, null(), null()),
+- format_reason(null(), null(), null(), error, detail, null(), null()))
++ sbuild::error<T>(this->format_error(null(), null(), null(), error, detail, null(), null()),
++ this->format_reason(null(), null(), null(), error, detail, null(), null()))
+ {
+ }
+
+@@ -76,8 +76,8 @@
+ parse_error (size_t line,
+ error_type error,
+ D const& detail):
+- sbuild::error<T>(format_error(line, null(), null(), error, detail, null(), null()),
+- format_reason(line, null(), null(), error, detail, null(), null()))
++ sbuild::error<T>(this->format_error(line, null(), null(), error, detail, null(), null()),
++ this->format_reason(line, null(), null(), error, detail, null(), null()))
+ {
+ }
+
+@@ -94,8 +94,8 @@
+ std::string const& group,
+ error_type error,
+ D const& detail):
+- sbuild::error<T>(format_error(line, group, null(), error, detail, null(), null()),
+- format_reason(line, group, null(), error, detail, null(), null()))
++ sbuild::error<T>(this->format_error(line, group, null(), error, detail, null(), null()),
++ this->format_reason(line, group, null(), error, detail, null(), null()))
+ {
+ }
+
+@@ -114,8 +114,8 @@
+ std::string const& key,
+ error_type error,
+ D const& detail):
+- sbuild::error<T>(format_error(line, group, key, error, detail, null(), null()),
+- format_reason(line, group, key, error, detail, null(), null()))
++ sbuild::error<T>(this->format_error(line, group, key, error, detail, null(), null()),
++ this->format_reason(line, group, key, error, detail, null(), null()))
+ {
+ }
+
+@@ -130,8 +130,8 @@
+ parse_error (std::string const& group,
+ error_type error,
+ D const& detail):
+- sbuild::error<T>(format_error(group, null(), null(), error, detail, null(), null()),
+- format_reason(group, null(), null(), error, detail, null(), null()))
++ sbuild::error<T>(this->format_error(group, null(), null(), error, detail, null(), null()),
++ this->format_reason(group, null(), null(), error, detail, null(), null()))
+ {
+ }
+
+@@ -148,8 +148,8 @@
+ std::string const& key,
+ error_type error,
+ D const& detail):
+- sbuild::error<T>(format_error(group, key, null(), error, detail, null(), null()),
+- format_reason(group, key, null(), error, detail, null(), null()))
++ sbuild::error<T>(this->format_error(group, key, null(), error, detail, null(), null()),
++ this->format_reason(group, key, null(), error, detail, null(), null()))
+ {
+ }
+
diff --git a/schroot.spec b/schroot.spec
index 2e895f6..5ada06d 100644
--- a/schroot.spec
+++ b/schroot.spec
@@ -1,6 +1,6 @@
Name: schroot
Version: 1.4.23
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Execute commands in a chroot environment
Group: Development/Tools
License: GPLv3+
@@ -8,6 +8,7 @@ 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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pam-devel
BuildRequires: boost-devel
@@ -56,10 +57,11 @@ functionality is available in the next generation tool called schroot.
%patch0 -p0
%patch1 -p0
+%patch2 -p1
%build
-%configure LIBS="-lboost_program_options -lboost_system -lboost_regex" --disable-rpath --enable-static --disable-shared --enable-dchroot || ( cat config.log && exit 1 )
+%configure LIBS="-lboost_program_options -lboost_system -lboost_regex" --disable-rpath --enable-static --disable-shared --enable-dchroot --disable-silent-rules || ( cat config.log && exit 1 )
make %{?_smp_mflags}
%install
@@ -140,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING ABOUT-NLS AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS TODO
%changelog
+* Tue Jan 17 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.4.23-4
+- Add schroot-1.4.23-gcc47.patch (Fix mass rebuild FTBFS).
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.23-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list