Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/xapian-core.git#87cd86a4a5e63e6d1f3a6ed51e4a8f9320c8a237
This commit is contained in:
DistroBaker 2020-10-28 00:08:09 +01:00 committed by Petr Šabata
parent 4a40414b4d
commit 8187a58334
2 changed files with 17 additions and 1 deletions

12
xapian-core-gcc11.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/api/omdocument.cc b/api/omdocument.cc
index 1134e9f..b540960 100644
--- a/api/omdocument.cc
+++ b/api/omdocument.cc
@@ -39,6 +39,7 @@
#include <algorithm>
#include <string>
+#include <limits>
using namespace std;

View File

@ -1,10 +1,11 @@
Name: xapian-core
Version: 1.4.17
Release: 1%{?dist}
Release: 2%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
License: GPLv2+
URL: http://www.xapian.org/
Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz
Patch0: %{name}-gcc11.patch
BuildRequires: gcc gcc-c++
BuildRequires: libuuid-devel
@ -102,6 +103,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
* Sat Oct 17 2020 Jeff Law <law@redhat.com> - 1.4.17-2
- Fix missing #include for gcc-11
* Mon Sep 21 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.4.17-1
- Update to 1.4.17