[monotone/el6/master] - Add patch for failing tests on ppc64.
Thomas Moschny
thm at fedoraproject.org
Sun Jan 9 15:22:57 UTC 2011
commit 0160a3cf3cbe79d8abe507e2941e022038bb1a05
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Sun Jan 9 16:21:36 2011 +0100
- Add patch for failing tests on ppc64.
monotone-0.99.1-fix-pcrewrap.patch | 19 +++++++++++++++++++
monotone.spec | 9 ++++++++-
2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/monotone-0.99.1-fix-pcrewrap.patch b/monotone-0.99.1-fix-pcrewrap.patch
new file mode 100644
index 0000000..599aa5e
--- /dev/null
+++ b/monotone-0.99.1-fix-pcrewrap.patch
@@ -0,0 +1,19 @@
+#
+# old_revision [6311a21b339135a6b9d4b98ef68e1e4e23183bb6]
+#
+# patch "pcrewrap.cc"
+# from [096c37a8fcdbd0d4baf2434d16dea8663ecd1704]
+# to [a4c2c48cb681e893d4bdda32bbebc0132479f8cd]
+#
+============================================================
+--- pcrewrap.cc 096c37a8fcdbd0d4baf2434d16dea8663ecd1704
++++ pcrewrap.cc a4c2c48cb681e893d4bdda32bbebc0132479f8cd
+@@ -144,7 +144,7 @@ namespace pcre
+ // because pcre_exec might not signal trailing unmatched subpatterns
+ // i.e. if "abc" matches "(abc)(de)?", the match count is two, not
+ // the expected three
+- size_t cap_count = 0;
++ int cap_count = 0;
+ int rc = pcre_fullinfo(basedat, extradat, PCRE_INFO_CAPTURECOUNT, &cap_count);
+ I(rc == 0);
+
diff --git a/monotone.spec b/monotone.spec
index 36e344e..dad154d 100644
--- a/monotone.spec
+++ b/monotone.spec
@@ -1,6 +1,6 @@
Name: monotone
Version: 0.99.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A free, distributed version control system
Group: Development/Tools
License: GPLv2+
@@ -9,6 +9,8 @@ Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.
Source1: monotone.init
Source2: monotone.sysconfig
Source3: README.monotone-server
+# Fixes failing tests on ppc.
+Patch0: monotone-0.99.1-fix-pcrewrap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel
BuildRequires: boost-devel >= 1.33.1
@@ -63,6 +65,8 @@ and then pass commands to it.
%prep
%setup -q
+%patch0 -p0
+
%build
%configure
@@ -200,6 +204,9 @@ fi
%changelog
+* Sun Jan 9 2011 Thomas Moschny <thomas.moschny at gmx.de> - 0.99.1-2
+- Add patch for failing tests on ppc64.
+
* Sun Oct 31 2010 Thomas Moschny <thomas.moschny at gmx.de> - 0.99.1-1
- Update to 0.99.1.
- Remove patch already applied upstream.
More information about the scm-commits
mailing list