From ecb1b0b47f0a06f6a522b0dbd4ad450c9f2732a1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 28 Feb 2012 13:15:55 -0600 Subject: [PATCH 1/2] - Rebuilt for c++ ABI breakage --- monotone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/monotone.spec b/monotone.spec index 5ba2b7d..2fa7693 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone Version: 1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A free, distributed version control system Group: Development/Tools License: GPLv2+ @@ -220,6 +220,9 @@ fi %changelog +* Tue Feb 28 2012 Fedora Release Engineering - 1.0-6 +- Rebuilt for c++ ABI breakage + * Fri Jan 13 2012 Fedora Release Engineering - 1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 2f8ea06f50b1084587cbade257fd502f638fa23f Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 16 Feb 2012 10:11:31 +0100 Subject: [PATCH 2/2] Add patch to fix building with newer pcre. --- monotone-1.0-pcre.patch | 11 +++++++++++ monotone.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 monotone-1.0-pcre.patch diff --git a/monotone-1.0-pcre.patch b/monotone-1.0-pcre.patch new file mode 100644 index 0000000..9abd4ac --- /dev/null +++ b/monotone-1.0-pcre.patch @@ -0,0 +1,11 @@ +diff -up monotone-1.0/test/func/syntax_errors_in_.mtn-ignore/mtn-ignore.orig monotone-1.0/test/func/syntax_errors_in_.mtn-ignore/mtn-ignore +--- monotone-1.0/test/func/syntax_errors_in_.mtn-ignore/mtn-ignore.orig 2011-03-26 07:41:05.000000000 +0100 ++++ monotone-1.0/test/func/syntax_errors_in_.mtn-ignore/mtn-ignore 2012-02-15 19:40:06.282866594 +0100 +@@ -21,7 +21,6 @@ abc\3 + [[:fnord:]] + \\x{123456} + (?(0)) +-(?<=\C) + \l + (?C256) + (?C1 diff --git a/monotone.spec b/monotone.spec index 2fa7693..2451dbf 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone Version: 1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A free, distributed version control system Group: Development/Tools License: GPLv2+ @@ -17,6 +17,8 @@ Patch1: monotone-1.0-fix-help.patch # FTBFS (symbol conflict with boost) # https://code.monotone.ca/p/monotone/issues/191/ Patch2: monotone-1.0-disable-xdelta-test.patch +# Fix a failing test with pcre >= 8.21 +Patch3: monotone-1.0-pcre.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel BuildRequires: boost-devel >= 1.33.1 @@ -75,6 +77,7 @@ and then pass commands to it. %patch0 -p0 %patch1 -p0 %patch2 -p1 +%patch3 -p1 %build @@ -220,6 +223,9 @@ fi %changelog +* Tue Feb 28 2012 Thomas Moschny - 1.0-7 +- Add patch to fix building with newer pcre. + * Tue Feb 28 2012 Fedora Release Engineering - 1.0-6 - Rebuilt for c++ ABI breakage