From 9a9ff750079a88e2149c40fec6e84e364dd54e26 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 11 Mar 2021 20:00:03 +0000
Subject: [PATCH] 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#46982e6ea5a177c729dd079ec983c510d052cb65
---
 sources                 |  2 +-
 xapian-core-gcc11.patch | 12 -----------
 xapian-core.spec        | 47 ++++++++++++++++++++++-------------------
 3 files changed, 26 insertions(+), 35 deletions(-)
 delete mode 100644 xapian-core-gcc11.patch

diff --git a/sources b/sources
index c5b746e..011a484 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xapian-core-1.4.17.tar.xz) = 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7
+SHA512 (xapian-core-1.4.18.tar.xz) = ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef
diff --git a/xapian-core-gcc11.patch b/xapian-core-gcc11.patch
deleted file mode 100644
index a91a738..0000000
--- a/xapian-core-gcc11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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;
- 
diff --git a/xapian-core.spec b/xapian-core.spec
index 39f1c2c..da33b3f 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,21 +1,26 @@
+# Currently fails on s390x and ARMv7
+%if ! 0%{?_module_build}
+%global with_tests 0
+%else
+%global with_tests 0
+%endif
+
 Name:          xapian-core
-Version:       1.4.17
-Release:       3%{?dist}
+Version:       1.4.18
+Release:       1%{?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
+URL:           https://www.xapian.org/
+Source0:       https://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz
 
-BuildRequires: make
-BuildRequires: gcc gcc-c++
+BuildRequires: gcc
+BuildRequires: gcc-c++
 BuildRequires: libuuid-devel
+BuildRequires: make
 BuildRequires: zlib-devel
-%if ! 0%{?_module_build}
-%ifarch %{valgrind_arches}
+%if 0%{?with_tests}
 BuildRequires: valgrind-devel
 %endif
-%endif
 Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
 
 
@@ -49,16 +54,7 @@ files needed for building packages which use Xapian
 %autosetup -p1
 
 %build
-# Disable SSE on x86, but leave it intact for x86_64
-%ifarch x86_64
-%configure --disable-static
-%else
-%configure --disable-static --disable-sse
-%endif
-
-# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%configure
 
 %{make_build}
 
@@ -71,6 +67,11 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 # Remove the dev docs, we pick them up below
 rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
+%if 0%{?with_tests}
+%check
+make check %{?_smp_mflags}
+%endif
+
 %ldconfig_scriptlets libs
 
 %files
@@ -82,7 +83,6 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %{_bindir}/simplesearch
 %{_bindir}/simpleexpand
 %{_datadir}/xapian-core/
-# man pages may be gzipped, hence the trailing wildcard.
 %{_mandir}/man1/xapian*
 %{_mandir}/man1/quest.1*
 %{_mandir}/man1/copydatabase.1*
@@ -100,10 +100,13 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %{_libdir}/cmake/xapian
 %{_libdir}/pkgconfig/xapian-core.pc
 %{_datadir}/aclocal/xapian.m4
-# man pages may be gzipped, hence the trailing wildcard.
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Sun Mar 07 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.4.18-1
+- Update to 1.4.18
+- Spec file cleanups
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild