[monotone] Add patch to fix building with newer pcre.
Thomas Moschny
thm at fedoraproject.org
Thu Feb 16 09:14:20 UTC 2012
commit 295457e2f0e25ef2b79965307a1556c638af5d5d
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Thu Feb 16 10:11:31 2012 +0100
Add patch to fix building with newer pcre.
monotone-1.0-pcre.patch | 11 +++++++++++
monotone.spec | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
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 0094588..208613b 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
+* Thu Feb 16 2012 Thomas Moschny <thomas.moschny at gmx.de> - 1.0-7
+- Add patch to fix building with newer pcre.
+
* Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 1.0-6
- Rebuild against PCRE 8.30
More information about the scm-commits
mailing list