Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Thomas Moschny
2f8ea06f50 Add patch to fix building with newer pcre. 2012-02-28 22:09:22 +01:00
Dennis Gilmore
ecb1b0b47f - Rebuilt for c++ ABI breakage 2012-02-28 13:15:55 -06:00
2 changed files with 21 additions and 1 deletions

11
monotone-1.0-pcre.patch Normal file
View file

@ -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

View file

@ -1,6 +1,6 @@
Name: monotone
Version: 1.0
Release: 5%{?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,12 @@ fi
%changelog
* Tue Feb 28 2012 Thomas Moschny <thomas.moschny@gmx.de> - 1.0-7
- Add patch to fix building with newer pcre.
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-6
- Rebuilt for c++ ABI breakage
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild