[xapian-core/el6] Update to 1.2.7

[Denis Arnaud]

commit 04da7ab0003e7fe621877eda3832edda6ca4110b
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date:   Sat Dec 10 22:28:14 2011 +0100

    Update to 1.2.7

 .gitignore       |    7 ++++++-
 sources          |    2 +-
 xapian-core.spec |   44 +++++++++++++++++++-------------------------
 3 files changed, 26 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b5efb8a..3928eae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
-xapian-core-1.0.20.tar.gz
+clog
+xapian-core-*.tar.*
+xapian-core-*.src.rpm
+.build-*.log
+/i?86/
+/x86_64/
diff --git a/sources b/sources
index ee950b6..22dad85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd3980da28be014a5ac29e40fa1fbbac  xapian-core-1.0.20.tar.gz
+6684eb7a990b9cedf4257f41bfddb584  xapian-core-1.2.7.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index f8e582b..3d09ac9 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,5 +1,5 @@
 Name:          xapian-core
-Version:       1.0.20
+Version:       1.2.7
 Release:       1%{?dist}
 Summary:       The Xapian Probabilistic Information Retrieval Library
 
@@ -7,11 +7,11 @@ Group:         Applications/Databases
 License:       GPLv2+
 URL:           http://www.xapian.org/
 Source0:       http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
-Patch0:        multilib-devel-conflict-fix.patch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: zlib-devel
-Requires:      %{name}-libs = %{version}
+BuildRequires: libuuid-devel
+Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 Xapian is an Open Source Probabilistic Information Retrieval Library. It
@@ -31,8 +31,7 @@ libraries for applications using Xapian functionality
 %package devel
 Group:         Development/Libraries
 Summary:       Files needed for building packages which use Xapian
-Requires:      %{name} = %{version}
-Requires:      %{name}-libs = %{version}
+Requires:      %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -42,10 +41,14 @@ files needed for building packages which use Xapian
 
 %prep
 %setup -q
-%patch0 -p1 -b .multilibfix
 
 %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
@@ -58,7 +61,7 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 # Remove libtool archives
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 # Remove the dev docs, we pick them up below
 rm -rf %{buildroot}%{_datadir}/doc/%{name}
@@ -72,36 +75,23 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{_bindir}/xapian-check
-%{_bindir}/xapian-inspect
-%{_bindir}/xapian-tcpsrv
-%{_bindir}/xapian-progsrv
-%{_bindir}/quartzcheck
-%{_bindir}/quartzcompact
-%{_bindir}/quartzdump
+%doc COPYING
+%{_bindir}/xapian*
 %{_bindir}/quest
 %{_bindir}/delve
 %{_bindir}/copydatabase
 %{_bindir}/simpleindex
 %{_bindir}/simplesearch
 %{_bindir}/simpleexpand
-%{_bindir}/xapian-compact
 # man pages may be gzipped, hence the trailing wildcard.
-%{_mandir}/man1/xapian-check.1*
-%{_mandir}/man1/xapian-inspect.1*
-%{_mandir}/man1/xapian-tcpsrv.1*
-%{_mandir}/man1/xapian-progsrv.1*
-%{_mandir}/man1/quartzcheck.1*
-%{_mandir}/man1/quartzcompact.1*
-%{_mandir}/man1/quartzdump.1*
+%{_mandir}/man1/xapian*.1*
 %{_mandir}/man1/quest.1*
 %{_mandir}/man1/delve.1*
 %{_mandir}/man1/copydatabase.1*
-%{_mandir}/man1/xapian-compact.1*
 
 %files libs
 %defattr(-, root, root)
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libxapian.so.*
 
 %files devel
@@ -111,11 +101,15 @@ rm -rf %{buildroot}
 %{_includedir}/xapian
 %{_includedir}/xapian.h
 %{_libdir}/libxapian.so
+%{_libdir}/cmake/xapian
 %{_datadir}/aclocal/xapian.m4
 # man pages may be gzipped, hence the trailing wildcard.
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Sat Dec 10 2011 Denis Arnaud <denis.arnaud_fedora at m4x.org> 1.2.7-1
+- Update to 1.2.7
+
 * Sat May  1 2010 Peter Robinson <pbrobinson at gmail.com> - 1.0.20-1
 - Update to 1.0.20