pbrobinson pushed to xapian-core (el6). "fix merge"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Jun 15 09:36:54 UTC 2015
From 5ba114f610228e205d01b97a9c48cbf919a53299 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting at fedoraproject.org>
Date: Wed, 25 Nov 2009 22:40:53 +0000
Subject: Fix typo that causes a failure to update the common directory.
(releng #2781)
diff --git a/Makefile b/Makefile
index ec4c848..891c81c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# Makefile for source rpm: xapian-core
-# $Id$
+# $Id: Makefile,v 1.1 2007/06/18 16:46:10 tibbs Exp $
NAME := xapian-core
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
--
cgit v0.10.2
From f89b9bf4e7cc8c47a780a252fec8d370521117f4 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Wed, 2 Dec 2009 06:17:53 +0000
Subject: - Update to 1.0.17
diff --git a/.cvsignore b/.cvsignore
index 0e57507..d1e2930 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xapian-core-1.0.16.tar.gz
+xapian-core-1.0.17.tar.gz
diff --git a/sources b/sources
index 573b42b..cb9e014 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-19756e128d804faa6e7975a629ca3b70 xapian-core-1.0.16.tar.gz
+455b50c24fc65ae51c38ae67167903c5 xapian-core-1.0.17.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index 881e83f..f9bccdb 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,5 +1,5 @@
Name: xapian-core
-Version: 1.0.16
+Version: 1.0.17
Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
@@ -116,6 +116,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Wed Dec 2 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.17-1
+- Update to 1.0.17
+
* Sun Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.16-1
- Update to 1.0.16, some spec file cleanups
--
cgit v0.10.2
From 23e3ff6ab8583dbfdcc1ce000e25fc75dfc4d4f7 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Sun, 21 Mar 2010 23:42:08 +0000
Subject: - Update to 1.0.18
diff --git a/.cvsignore b/.cvsignore
index d1e2930..98f6793 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xapian-core-1.0.17.tar.gz
+xapian-core-1.0.18.tar.gz
diff --git a/sources b/sources
index cb9e014..f639077 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-455b50c24fc65ae51c38ae67167903c5 xapian-core-1.0.17.tar.gz
+a6b911a68df200c99fb8f8f363fa7dad xapian-core-1.0.18.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index f9bccdb..c476cc3 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,5 +1,5 @@
Name: xapian-core
-Version: 1.0.17
+Version: 1.0.18
Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
@@ -116,6 +116,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sun Mar 21 2010 Peter Robinson <pbrobinson at gmail.com> - 1.0.18-1
+- Update to 1.0.18
+
* Wed Dec 2 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.17-1
- Update to 1.0.17
--
cgit v0.10.2
From 8ecda31d319e43c07a2a4774386634e8262f82da Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Sat, 1 May 2010 20:44:28 +0000
Subject: - Update to 1.0.20
diff --git a/.cvsignore b/.cvsignore
index 98f6793..b5efb8a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xapian-core-1.0.18.tar.gz
+xapian-core-1.0.20.tar.gz
diff --git a/sources b/sources
index f639077..ee950b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a6b911a68df200c99fb8f8f363fa7dad xapian-core-1.0.18.tar.gz
+fd3980da28be014a5ac29e40fa1fbbac xapian-core-1.0.20.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index c476cc3..f8e582b 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,5 +1,5 @@
Name: xapian-core
-Version: 1.0.18
+Version: 1.0.20
Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
@@ -116,6 +116,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sat May 1 2010 Peter Robinson <pbrobinson at gmail.com> - 1.0.20-1
+- Update to 1.0.20
+
* Sun Mar 21 2010 Peter Robinson <pbrobinson at gmail.com> - 1.0.18-1
- Update to 1.0.18
--
cgit v0.10.2
From 1d34ab9e9616d95edcdbcef1d7b0f1c272c5ba8e Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Sat, 1 May 2010 22:03:06 +0000
Subject: - Update to 1.2.0
diff --git a/xapian-core.spec b/xapian-core.spec
index f8e582b..7af4557 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,5 +1,5 @@
Name: xapian-core
-Version: 1.0.20
+Version: 1.2.0
Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
@@ -11,6 +11,7 @@ Patch0: multilib-devel-conflict-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel
+BuildRequires: libuuid-devel
Requires: %{name}-libs = %{version}
%description
@@ -42,7 +43,7 @@ files needed for building packages which use Xapian
%prep
%setup -q
-%patch0 -p1 -b .multilibfix
+#%patch0 -p1 -b .multilibfix
%build
%configure --disable-static
@@ -73,13 +74,7 @@ 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
+%{_bindir}/xapian*
%{_bindir}/quest
%{_bindir}/delve
%{_bindir}/copydatabase
@@ -88,17 +83,10 @@ rm -rf %{buildroot}
%{_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*
%{_mandir}/man1/quest.1*
%{_mandir}/man1/delve.1*
%{_mandir}/man1/copydatabase.1*
-%{_mandir}/man1/xapian-compact.1*
%files libs
%defattr(-, root, root)
@@ -109,15 +97,14 @@ rm -rf %{buildroot}
%doc HACKING PLATFORMS docs/*html docs/apidoc docs/*pdf
%{_bindir}/xapian-config
%{_includedir}/xapian
-%{_includedir}/xapian.h
%{_libdir}/libxapian.so
%{_datadir}/aclocal/xapian.m4
# man pages may be gzipped, hence the trailing wildcard.
%{_mandir}/man1/xapian-config.1*
%changelog
-* Sat May 1 2010 Peter Robinson <pbrobinson at gmail.com> - 1.0.20-1
-- Update to 1.0.20
+* Sat May 1 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.0-1
+- Update to 1.2.0
* Sun Mar 21 2010 Peter Robinson <pbrobinson at gmail.com> - 1.0.18-1
- Update to 1.0.18
--
cgit v0.10.2
From 350eb7e27bfa3ee36327cb6def0631d401a2a959 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Sat, 1 May 2010 22:14:33 +0000
Subject: - upload source
diff --git a/.cvsignore b/.cvsignore
index b5efb8a..cc6a61e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xapian-core-1.0.20.tar.gz
+xapian-core-1.2.0.tar.gz
diff --git a/sources b/sources
index ee950b6..1203b68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd3980da28be014a5ac29e40fa1fbbac xapian-core-1.0.20.tar.gz
+121b5333d3debcf08ed0be714a641eef xapian-core-1.2.0.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index 7af4557..8a3d48e 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -103,6 +103,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sat May 1 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.0-2
+- Upload new source
+
* Sat May 1 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.0-1
- Update to 1.2.0
--
cgit v0.10.2
From ce78b2184bebe85d97eb3adee1ad9082fd6953c6 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Fri, 7 May 2010 07:42:44 +0000
Subject: - Add the libtool archive (temporarily) to fix build of bindings
diff --git a/xapian-core.spec b/xapian-core.spec
index 8a3d48e..bef6c9c 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -59,7 +59,7 @@ rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'
# Remove libtool archives
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+# find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
# Remove the dev docs, we pick them up below
rm -rf %{buildroot}%{_datadir}/doc/%{name}
@@ -98,11 +98,15 @@ rm -rf %{buildroot}
%{_bindir}/xapian-config
%{_includedir}/xapian
%{_libdir}/libxapian.so
+%{_libdir}/libxapian.la
%{_datadir}/aclocal/xapian.m4
# man pages may be gzipped, hence the trailing wildcard.
%{_mandir}/man1/xapian-config.1*
%changelog
+* Fri May 7 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.0-3
+- Add the libtool archive (temporarily) to fix build of bindings
+
* Sat May 1 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.0-2
- Upload new source
--
cgit v0.10.2
From 7caab4124cb43d2a9b2d6bb35bba2a6d3453eda1 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Mon, 12 Jul 2010 09:14:16 +0000
Subject: - Move license to libs package, a few other spc cleanups
diff --git a/xapian-core.spec b/xapian-core.spec
index bef6c9c..33a0b60 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel
BuildRequires: libuuid-devel
-Requires: %{name}-libs = %{version}
+Requires: %{name}-libs = %{version}-%{release}
%description
Xapian is an Open Source Probabilistic Information Retrieval Library. It
@@ -32,8 +32,8 @@ 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} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description devel
Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -43,7 +43,6 @@ files needed for building packages which use Xapian
%prep
%setup -q
-#%patch0 -p1 -b .multilibfix
%build
%configure --disable-static
@@ -73,7 +72,6 @@ rm -rf %{buildroot}
%files
%defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/xapian*
%{_bindir}/quest
%{_bindir}/delve
@@ -90,6 +88,7 @@ rm -rf %{buildroot}
%files libs
%defattr(-, root, root)
+%doc AUTHORS ChangeLog COPYING NEWS README
%{_libdir}/libxapian.so.*
%files devel
@@ -104,6 +103,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Fri May 7 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.0-4
+- Move license to libs package, a few other spc cleanups
+
* Fri May 7 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.0-3
- Add the libtool archive (temporarily) to fix build of bindings
--
cgit v0.10.2
From 78b827ed01047f4cbd10523b91f74bc7b2445479 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Wed, 14 Jul 2010 14:29:46 +0000
Subject: - Update to 1.2.2
diff --git a/.cvsignore b/.cvsignore
index cc6a61e..6cc8e55 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xapian-core-1.2.0.tar.gz
+xapian-core-1.2.2.tar.gz
diff --git a/multilib-devel-conflict-fix.patch b/multilib-devel-conflict-fix.patch
deleted file mode 100644
index b4b833b..0000000
--- a/multilib-devel-conflict-fix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -upNr xapian-core-1.0.5.orign/xapian-config.in xapian-core-1.0.5/xapian-config.in
---- xapian-core-1.0.5.orign/xapian-config.in 2007-12-21 04:01:25.000000000 +0100
-+++ xapian-core-1.0.5/xapian-config.in 2007-12-26 23:58:34.000000000 +0100
-@@ -61,24 +61,6 @@ is_uninstalled()
-
- need_explicit_dependencies()
- {
-- # For static libraries, we need to explicitly link with dependency_libs
-- # on all platforms. If we only have static libraries, then "$dlname"
-- # will be empty.
-- extract_dlname "@libdir@/libxapian.la"
-- [ -n "$dlname" ] || return 0 # "true"
--
-- # If libtool has been patched to give link_all_deplibs=no, don't link them.
-- [ no != "@link_all_deplibs_CXX@" ] || return 1 # "false"
--
-- # Handle cases which libtool thinks are "unknown", but we know are "no".
-- if [ yes != "@link_all_deplibs_CXX@" ]; then
-- case "@host_os@" in
-- linux* | k*bsd*-gnu)
-- # We don't need dependency_libs for shared libraries on these
-- # platforms, but upstream libtool doesn't know this (yet).
-- return 1 ;; # "false"
-- esac
-- fi
- return 0 # "true"
- }
-
-@@ -91,7 +73,6 @@ set_F_to_extra_ldflags() {
- # -L option required (if any).
- set_L_to_library_path() {
- L=
-- [ /usr/lib != "@libdir@" ] && L="-L at libdir@ "
- }
-
- # -I options for compiling against an uninstalled xapian.
-@@ -227,10 +208,6 @@ while [ 0 != "$#" ] ; do
- set_F_to_extra_ldflags
- set_L_to_library_path
- D=
-- if need_explicit_dependencies ; then
-- extract_dependency_libs "@libdir@/libxapian.la"
-- [ -n "$dependency_libs" ] && D=" $dependency_libs"
-- fi
- echo "$F$L-lxapian$D"
- ;;
-
-@@ -245,22 +222,6 @@ while [ 0 != "$#" ] ; do
- continue
- fi
-
-- # If we need to pull in dependency_libs, we need libxapian.la.
-- # Otherwise just use the appropriate -L and -l options.
-- # Upstream libtool currently never sets link_all_deplibs_CXX=no.
-- # Some Linux distros patch libtool to return no, and some have an
-- # unhelpful policy of not packaging .la files in an attempt to work
-- # around this. So avoiding using libtool here gives more consistent
-- # behaviour.
-- if need_explicit_dependencies ; then
-- if [ -f "@libdir@/libxapian.la" ]; then
-- echo "${F}@libdir@/libxapian.la"
-- continue
-- fi
--
-- echo "$0: Can't find libxapian.la to link against." 1>&2
-- exit 1
-- fi
-
- set_L_to_library_path
- echo "$F$L-lxapian"
diff --git a/sources b/sources
index 1203b68..6922dd9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-121b5333d3debcf08ed0be714a641eef xapian-core-1.2.0.tar.gz
+14f14f7a3e8821fff4bdfa8f475e7328 xapian-core-1.2.2.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index 33a0b60..1b3bd51 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,13 +1,12 @@
Name: xapian-core
-Version: 1.2.0
-Release: 4%{?dist}
+Version: 1.2.2
+Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
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)
BuildRequires: zlib-devel
@@ -103,6 +102,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Wed Jul 14 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.2-1
+- Update to 1.2.2
+
* Fri May 7 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.0-4
- Move license to libs package, a few other spc cleanups
--
cgit v0.10.2
From 088be179eeb8699bb9fbdd22c4d456b6bed204e2 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Fri, 23 Jul 2010 13:57:08 +0000
Subject: - add cmake stuff
diff --git a/xapian-core.spec b/xapian-core.spec
index 1b3bd51..443058b 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -78,7 +78,6 @@ rm -rf %{buildroot}
%{_bindir}/simpleindex
%{_bindir}/simplesearch
%{_bindir}/simpleexpand
-%{_bindir}/xapian-compact
# man pages may be gzipped, hence the trailing wildcard.
%{_mandir}/man1/xapian*
%{_mandir}/man1/quest.1*
@@ -95,13 +94,24 @@ rm -rf %{buildroot}
%doc HACKING PLATFORMS docs/*html docs/apidoc docs/*pdf
%{_bindir}/xapian-config
%{_includedir}/xapian
+%{_includedir}/xapian.h
%{_libdir}/libxapian.so
%{_libdir}/libxapian.la
+%{_libdir}/cmake/xapian
%{_datadir}/aclocal/xapian.m4
# man pages may be gzipped, hence the trailing wildcard.
%{_mandir}/man1/xapian-config.1*
+ File listed twice: /usr/bin/xapian-compact
+ Installed (but unpackaged) file(s) found:
+ /usr/include/xapian.h
+ /usr/lib/cmake/xapian/xapian-config-version.cmake
+ /usr/lib/cmake/xapian/xapian-config.cmake
+
%changelog
+* Wed Jul 14 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.2-2
+- Add cmake stuff
+
* Wed Jul 14 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.2-1
- Update to 1.2.2
--
cgit v0.10.2
From 97ee3d34b4cb5319fb4df6a5cb007b643b00eccd Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Fri, 23 Jul 2010 14:08:07 +0000
Subject: - And remove non spec cut-n-paste issue
diff --git a/xapian-core.spec b/xapian-core.spec
index 443058b..1026359 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -102,13 +102,10 @@ rm -rf %{buildroot}
# man pages may be gzipped, hence the trailing wildcard.
%{_mandir}/man1/xapian-config.1*
- File listed twice: /usr/bin/xapian-compact
- Installed (but unpackaged) file(s) found:
- /usr/include/xapian.h
- /usr/lib/cmake/xapian/xapian-config-version.cmake
- /usr/lib/cmake/xapian/xapian-config.cmake
-
%changelog
+* Wed Jul 14 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.2-3
+- And remove non spec cut-n-paste issue
+
* Wed Jul 14 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.2-2
- Add cmake stuff
--
cgit v0.10.2
From 988bdb656872c91f2d6e770e5699f89f8d053af1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:31:45 +0000
Subject: dist-git conversion
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 6cc8e55..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xapian-core-1.2.2.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6cc8e55
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xapian-core-1.2.2.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 891c81c..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xapian-core
-# $Id: Makefile,v 1.1 2007/06/18 16:46:10 tibbs Exp $
-NAME := xapian-core
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--
cgit v0.10.2
From ec183e921dcf4c25b5d58239ff45193c26340436 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Thu, 5 Aug 2010 07:21:07 +0100
Subject: - Disable SSE instructions by default
diff --git a/xapian-core.spec b/xapian-core.spec
index 1026359..6e1e816 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -44,7 +44,7 @@ files needed for building packages which use Xapian
%setup -q
%build
-%configure --disable-static
+%configure --disable-static --disable-sse
# 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
@@ -103,6 +103,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Thu Aug 5 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.2-4
+- Disable SSE instructions by default
+
* Wed Jul 14 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.2-3
- And remove non spec cut-n-paste issue
--
cgit v0.10.2
From 86165a6f12ade51568f4e3967dbcf42bdc0491f9 Mon Sep 17 00:00:00 2001
From: Adel Gadllah <adel.gadllah at gmail.com>
Date: Thu, 5 Aug 2010 19:29:10 +0200
Subject: Reenable SSE on x86_64
SSE/SSE2 is part of the standard x86_64 ABI and thus *always* present.
diff --git a/xapian-core.spec b/xapian-core.spec
index 6e1e816..c1cdbcf 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -44,7 +44,12 @@ files needed for building packages which use Xapian
%setup -q
%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
@@ -103,6 +108,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Thu Aug 5 2010 Adel Gadllah <adel.gadllah at gmail.com> - 1.2.2-5
+- Reenable SSE on x86_64
+
* Thu Aug 5 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.2-4
- Disable SSE instructions by default
--
cgit v0.10.2
From ba3c65403e1bf4d1d3c0af558b5541bd90817fa3 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Mon, 30 Aug 2010 23:08:44 +0100
Subject: Update to 1.2.3
diff --git a/.gitignore b/.gitignore
index 6cc8e55..240a894 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
xapian-core-1.2.2.tar.gz
+/xapian-core-1.2.3.tar.gz
diff --git a/sources b/sources
index 6922dd9..50a40eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14f14f7a3e8821fff4bdfa8f475e7328 xapian-core-1.2.2.tar.gz
+999c1bb3a6226ed13c9cd05face89041 xapian-core-1.2.3.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index c1cdbcf..e2ac76e 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
-Version: 1.2.2
-Release: 5%{?dist}
+Version: 1.2.3
+Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -108,6 +108,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Mon Aug 30 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.3-1
+- Update to 1.2.3
+
* Thu Aug 5 2010 Adel Gadllah <adel.gadllah at gmail.com> - 1.2.2-5
- Reenable SSE on x86_64
--
cgit v0.10.2
From 57e7ebab7d529b382e2031dca072614b068d8e20 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Sun, 16 Jan 2011 18:07:11 +0000
Subject: 1.2.4
diff --git a/.gitignore b/.gitignore
index 240a894..a15b4fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
xapian-core-1.2.2.tar.gz
/xapian-core-1.2.3.tar.gz
+/xapian-core-1.2.4.tar.gz
diff --git a/sources b/sources
index 50a40eb..549336b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-999c1bb3a6226ed13c9cd05face89041 xapian-core-1.2.3.tar.gz
+9715684900547649e0cbec42e6a157e9 xapian-core-1.2.4.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index e2ac76e..8ffe725 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,5 +1,5 @@
Name: xapian-core
-Version: 1.2.3
+Version: 1.2.4
Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
@@ -108,6 +108,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sun Jan 16 2011 Peter Robinson <pbrobinson at gmail.com> - 1.2.4-1
+- Update to 1.2.4
+
* Mon Aug 30 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.3-1
- Update to 1.2.3
--
cgit v0.10.2
From 01c89ae8b241d3da41d4e1fd37141303d8c25aa9 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Mon, 7 Feb 2011 21:29:46 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/xapian-core.spec b/xapian-core.spec
index 8ffe725..6ef3563 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -108,6 +108,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Sun Jan 16 2011 Peter Robinson <pbrobinson at gmail.com> - 1.2.4-1
- Update to 1.2.4
--
cgit v0.10.2
From 6938df146b12c89da9f76b29d29f969dfebabf4f Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Thu, 18 Aug 2011 16:14:32 +0100
Subject: 1.2.7
diff --git a/.gitignore b/.gitignore
index a15b4fa..6824137 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
xapian-core-1.2.2.tar.gz
/xapian-core-1.2.3.tar.gz
/xapian-core-1.2.4.tar.gz
+/xapian-core-1.2.7.tar.gz
diff --git a/sources b/sources
index 549336b..22dad85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9715684900547649e0cbec42e6a157e9 xapian-core-1.2.4.tar.gz
+6684eb7a990b9cedf4257f41bfddb584 xapian-core-1.2.7.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index 6ef3563..9eb45b3 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,13 +1,12 @@
Name: xapian-core
-Version: 1.2.4
-Release: 2%{?dist}
+Version: 1.2.7
+Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
License: GPLv2+
URL: http://www.xapian.org/
Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel
BuildRequires: libuuid-devel
@@ -58,7 +57,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags} V=1
%install
-rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'
# Remove libtool archives
@@ -71,9 +69,6 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%postun libs -p /sbin/ldconfig
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-, root, root)
%{_bindir}/xapian*
@@ -108,67 +103,70 @@ rm -rf %{buildroot}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Thu Aug 18 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.7-1
+- Update to 1.2.7
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-* Sun Jan 16 2011 Peter Robinson <pbrobinson at gmail.com> - 1.2.4-1
+* Sun Jan 16 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.4-1
- Update to 1.2.4
-* Mon Aug 30 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.3-1
+* Mon Aug 30 2010 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.3-1
- Update to 1.2.3
* Thu Aug 5 2010 Adel Gadllah <adel.gadllah at gmail.com> - 1.2.2-5
- Reenable SSE on x86_64
-* Thu Aug 5 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.2-4
+* Thu Aug 5 2010 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.2-4
- Disable SSE instructions by default
-* Wed Jul 14 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.2-3
+* Wed Jul 14 2010 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.2-3
- And remove non spec cut-n-paste issue
-* Wed Jul 14 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.2-2
+* Wed Jul 14 2010 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.2-2
- Add cmake stuff
-* Wed Jul 14 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.2-1
+* Wed Jul 14 2010 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.2-1
- Update to 1.2.2
-* Fri May 7 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.0-4
+* Fri May 7 2010 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.0-4
- Move license to libs package, a few other spc cleanups
-* Fri May 7 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.0-3
+* Fri May 7 2010 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.0-3
- Add the libtool archive (temporarily) to fix build of bindings
-* Sat May 1 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.0-2
+* Sat May 1 2010 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.0-2
- Upload new source
-* Sat May 1 2010 Peter Robinson <pbrobinson at gmail.com> - 1.2.0-1
+* Sat May 1 2010 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.0-1
- Update to 1.2.0
-* Sun Mar 21 2010 Peter Robinson <pbrobinson at gmail.com> - 1.0.18-1
+* Sun Mar 21 2010 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.18-1
- Update to 1.0.18
-* Wed Dec 2 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.17-1
+* Wed Dec 2 2009 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.17-1
- Update to 1.0.17
-* Sun Sep 19 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.16-1
+* Sun Sep 19 2009 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.16-1
- Update to 1.0.16, some spec file cleanups
-* Thu Aug 27 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.15-1
+* Thu Aug 27 2009 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.15-1
- Update to 1.0.15
-* Wed Jul 29 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.14-1
+* Wed Jul 29 2009 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.14-1
- Update to 1.0.14
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-* Fri Jun 5 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.13-1
+* Fri Jun 5 2009 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.13-1
- Update to 1.0.13
-* Sun Apr 12 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.12-1
+* Sun Apr 12 2009 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.12-1
- Update to 1.0.12
-* Mon Apr 06 2009 Peter Robinson <pbrobinson at gmail.com> - 1.0.11-1
+* Mon Apr 06 2009 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.11-1
- Update to 1.0.11
* Wed Mar 04 2009 Caolán McNamara <caolanm at redhat.com> - 1.0.9-4
--
cgit v0.10.2
From f34c94fd71169fe51b28f35a01808247dbb77171 Mon Sep 17 00:00:00 2001
From: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date: Sat, 10 Dec 2011 22:40:34 +0100
Subject: [Git] Just ignored a few temporary/generated files.
diff --git a/.gitignore b/.gitignore
index 6824137..3928eae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
-xapian-core-1.2.2.tar.gz
-/xapian-core-1.2.3.tar.gz
-/xapian-core-1.2.4.tar.gz
-/xapian-core-1.2.7.tar.gz
+clog
+xapian-core-*.tar.*
+xapian-core-*.src.rpm
+.build-*.log
+/i?86/
+/x86_64/
--
cgit v0.10.2
From a8fb21382502294a999863844f7ea6e5680dab64 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sat, 14 Jan 2012 02:35:36 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/xapian-core.spec b/xapian-core.spec
index 9eb45b3..dd1c13c 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -103,6 +103,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Thu Aug 18 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.7-1
- Update to 1.2.7
--
cgit v0.10.2
From d949968da731005c28fcbc24dcd3af210b093f87 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Sat, 21 Jan 2012 13:04:26 +0000
Subject: 1.2.8
diff --git a/.gitignore b/.gitignore
index 3928eae..dab2046 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1 @@
-clog
xapian-core-*.tar.*
-xapian-core-*.src.rpm
-.build-*.log
-/i?86/
-/x86_64/
diff --git a/sources b/sources
index 22dad85..148e151 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6684eb7a990b9cedf4257f41bfddb584 xapian-core-1.2.7.tar.gz
+6c9f9e7ac43aa4e086283201329e98ee xapian-core-1.2.8.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index 9eb45b3..011c4fe 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,5 +1,5 @@
Name: xapian-core
-Version: 1.2.7
+Version: 1.2.8
Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
@@ -103,6 +103,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sat Jan 21 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.8-1
+- Update to 1.2.8
+
* Thu Aug 18 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.7-1
- Update to 1.2.7
--
cgit v0.10.2
From 249cb017e0f77b13ae04f723e134a91c5c7162c3 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Tue, 28 Feb 2012 14:36:43 -0600
Subject: - Rebuilt for c++ ABI breakage
diff --git a/xapian-core.spec b/xapian-core.spec
index 17e1976..25bf2fb 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -103,6 +103,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-2
+- Rebuilt for c++ ABI breakage
+
* Sat Jan 21 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.8-1
- Update to 1.2.8
--
cgit v0.10.2
From fecbd55fa540f6cc71b5e2e56f234f1a2365ca82 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Sun, 29 Apr 2012 21:09:43 +0100
Subject: 1.2.9
diff --git a/sources b/sources
index 148e151..8736177 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c9f9e7ac43aa4e086283201329e98ee xapian-core-1.2.8.tar.gz
+909dd02931fe8f37690aa82a4daaa441 xapian-core-1.2.9.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index 25bf2fb..da653b2 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
-Version: 1.2.8
-Release: 2%{?dist}
+Version: 1.2.9
+Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -103,6 +103,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sun Apr 29 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.9-1
+- Update to 1.2.9
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-2
- Rebuilt for c++ ABI breakage
--
cgit v0.10.2
From 3ae10fb9e9fadf32c534a6721fb35b44faecfbdc Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Wed, 4 Jul 2012 14:50:51 +0100
Subject: 1.2.12
diff --git a/sources b/sources
index 8736177..8a671a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-909dd02931fe8f37690aa82a4daaa441 xapian-core-1.2.9.tar.gz
+faf33a3945edbe4c848627750856cbeb xapian-core-1.2.12.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index da653b2..dc8e324 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,5 +1,5 @@
Name: xapian-core
-Version: 1.2.9
+Version: 1.2.12
Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
@@ -103,6 +103,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Wed Jul 4 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.12-1
+- Update to 1.2.12
+
* Sun Apr 29 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.9-1
- Update to 1.2.9
--
cgit v0.10.2
From 0fdd45ada64c95b5fba48c37410484ab3f71d4fb Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sat, 21 Jul 2012 23:18:36 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/xapian-core.spec b/xapian-core.spec
index dc8e324..4a2f808 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.12
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -103,6 +103,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Wed Jul 4 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.12-1
- Update to 1.2.12
--
cgit v0.10.2
From c557474c707e3da7dbf45ead6035a83c1ebc40a4 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Thu, 14 Feb 2013 21:25:06 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/xapian-core.spec b/xapian-core.spec
index 4a2f808..d81c7ee 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.12
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -103,6 +103,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
--
cgit v0.10.2
From 9b8e2da0a825e73c276141bb0e4ce172e3dddfbf Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Sat, 23 Mar 2013 16:49:27 +0000
Subject: 1.2.14
diff --git a/sources b/sources
index 8a671a6..66a5c09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-faf33a3945edbe4c848627750856cbeb xapian-core-1.2.12.tar.gz
+504183f39ef580ad8c4bb64b1a9cdeab xapian-core-1.2.14.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index d81c7ee..005c0cb 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
-Version: 1.2.12
-Release: 3%{?dist}
+Version: 1.2.14
+Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -103,6 +103,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sat Mar 23 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.14
+- Update to 1.2.14
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
--
cgit v0.10.2
From 70debe02af7b65a275b30baf4a2deb5d6fb27e7c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sun, 4 Aug 2013 02:31:14 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/xapian-core.spec b/xapian-core.spec
index 005c0cb..79b5945 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.14
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -103,6 +103,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Sat Mar 23 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.14
- Update to 1.2.14
--
cgit v0.10.2
From 399fa30d895721562761ae9ff3d76c59e4294089 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Fri, 23 Aug 2013 10:55:03 +0100
Subject: 1.2.15
diff --git a/sources b/sources
index 66a5c09..def124f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-504183f39ef580ad8c4bb64b1a9cdeab xapian-core-1.2.14.tar.gz
+3af45069c6a14a7ecad2da24cbc3d2c5 xapian-core-1.2.15.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index 79b5945..8e51d2d 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
-Version: 1.2.14
-Release: 2%{?dist}
+Version: 1.2.15
+Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -103,6 +103,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Fri Aug 23 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.15-1
+- Update to 1.2.15
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -168,89 +171,3 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
* Sat May 1 2010 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2.0-1
- Update to 1.2.0
-
-* Sun Mar 21 2010 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.18-1
-- Update to 1.0.18
-
-* Wed Dec 2 2009 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.17-1
-- Update to 1.0.17
-
-* Sun Sep 19 2009 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.16-1
-- Update to 1.0.16, some spec file cleanups
-
-* Thu Aug 27 2009 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.15-1
-- Update to 1.0.15
-
-* Wed Jul 29 2009 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.14-1
-- Update to 1.0.14
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Jun 5 2009 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.13-1
-- Update to 1.0.13
-
-* Sun Apr 12 2009 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.12-1
-- Update to 1.0.12
-
-* Mon Apr 06 2009 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.11-1
-- Update to 1.0.11
-
-* Wed Mar 04 2009 Caolán McNamara <caolanm at redhat.com> - 1.0.9-4
-- include stdio.h for rename, fix bare #elif, EOF -> -1 for getopt
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Dec 05 2008 Adel Gadllah <adel.gadllah at gmail.com> 1.0.9-2
-- Fix build
-
-* Sat Nov 29 2008 Adel Gadllah <adel.gadllah at gmail.com> 1.0.9-1
-- Update to 1.0.9
-
-* Sat Oct 11 2008 Adel Gadllah <adel.gadllah at gmail.com> 1.0.8-1
-- Update to 1.0.8
-
-* Sun Jul 20 2008 Adel Gadllah <adel.gadllah at gmail.com> 1.0.7-1
-- Update to 1.0.7
-
-* Sun Mar 30 2008 Adel Gadllah <adel.gadllah at gmail.com> 1.0.6-1
-- Update to 1.0.6
-
-* Sat Feb 09 2008 Adel Gadllah <adel.gadllah at gmail.com> 1.0.5-2
-- Rebuild for gcc-4.3
-
-* Thu Dec 27 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.5-1
-- Update to 1.0.5
-
-* Tue Oct 30 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.4-1
-- Update to 1.0.4
-
-* Fri Oct 25 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.2-7
-- Fix up multilib patch
-
-* Thu Oct 25 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.2-6
-- Fix multilib conflict in devel package (RH #343471)
-
-* Tue Aug 21 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.2-5
-- Rebuild for BuildID and ppc32 bug
-
-* Wed Aug 08 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.2-4
-- Add disttag
-
-* Wed Aug 08 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.2-3
-- Bump to avoid tag conflict
-
-* Wed Aug 08 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.2-2
-- Add missing files
-- Minor cleanups
-
-* Wed Aug 08 2007 Adel Gadllah <adel.gadllah at gmail.com> 1.0.2-1
-- Update to 1.0.2
-- Fix License tag
-
-* Sat Jun 16 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.0.1-1
-- Update to 1.0.1
-
-* Tue May 8 2007 Marco Pesenti Gritti <mpg at redhat.com> 0.9.10-2.2.svn8397
-- Initial build
--
cgit v0.10.2
From 750a2d51ff7a7bad6fb0a16e2f017e8c7fa014c2 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Sun, 12 Jan 2014 20:27:27 +0000
Subject: 1.2.16
diff --git a/sources b/sources
index def124f..b51ef0d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3af45069c6a14a7ecad2da24cbc3d2c5 xapian-core-1.2.15.tar.gz
+c6cc420f464711434edd19594b9d434b xapian-core-1.2.16.tar.xz
diff --git a/xapian-core.spec b/xapian-core.spec
index 8e51d2d..1a18f38 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,5 +1,5 @@
Name: xapian-core
-Version: 1.2.15
+Version: 1.2.16
Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
@@ -70,7 +70,6 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%postun libs -p /sbin/ldconfig
%files
-%defattr(-, root, root)
%{_bindir}/xapian*
%{_bindir}/quest
%{_bindir}/delve
@@ -85,12 +84,10 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/copydatabase.1*
%files libs
-%defattr(-, root, root)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_libdir}/libxapian.so.*
%files devel
-%defattr(-, root, root)
%doc HACKING PLATFORMS docs/*html docs/apidoc docs/*pdf
%{_bindir}/xapian-config
%{_includedir}/xapian
@@ -103,6 +100,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sun Jan 12 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.16-1
+- Update to 1.2.16
+
* Fri Aug 23 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.15-1
- Update to 1.2.15
--
cgit v0.10.2
From cb860474113d722f1f16961f02b0636659e0a493 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Sun, 12 Jan 2014 20:32:01 +0000
Subject: fix tar extension
diff --git a/xapian-core.spec b/xapian-core.spec
index 1a18f38..a7ccfd4 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -6,7 +6,7 @@ Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
License: GPLv2+
URL: http://www.xapian.org/
-Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
+Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz
BuildRequires: zlib-devel
BuildRequires: libuuid-devel
--
cgit v0.10.2
From 763d293ccff10086bf282c4899ef26b59b9f666d Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Sat, 15 Feb 2014 14:09:19 +0000
Subject: 1.2.17
diff --git a/sources b/sources
index b51ef0d..a12ffa1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c6cc420f464711434edd19594b9d434b xapian-core-1.2.16.tar.xz
+493117bf45e5471e86b4fc5d6d8069dc xapian-core-1.2.17.tar.xz
diff --git a/xapian-core.spec b/xapian-core.spec
index a7ccfd4..2f6e991 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,5 +1,5 @@
Name: xapian-core
-Version: 1.2.16
+Version: 1.2.17
Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
@@ -100,6 +100,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sat Feb 15 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.17-1
+- Update to 1.2.17
+
* Sun Jan 12 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.16-1
- Update to 1.2.16
--
cgit v0.10.2
From 59a21876278edea6e7a5cfd66a2c14e7b8f51301 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sun, 8 Jun 2014 00:09:04 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/xapian-core.spec b/xapian-core.spec
index 2f6e991..67df4f9 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.17
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -100,6 +100,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Sat Feb 15 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.17-1
- Update to 1.2.17
--
cgit v0.10.2
From f7c5d2dc8908b2ffc39f2c37d33de482a5be0c98 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Mon, 18 Aug 2014 09:10:36 +0000
Subject: - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/xapian-core.spec b/xapian-core.spec
index 67df4f9..4e7d1b5 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.17
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -100,6 +100,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.17-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
cgit v0.10.2
From 43629c0f9a9b5b40af6e302a2bb74b851fc4a6cd Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Mon, 1 Sep 2014 22:58:45 +0100
Subject: 1.2.18
diff --git a/sources b/sources
index a12ffa1..f24e653 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-493117bf45e5471e86b4fc5d6d8069dc xapian-core-1.2.17.tar.xz
+0ccbf68ade12e7b1ead10c57f4447899 xapian-core-1.2.18.tar.xz
diff --git a/xapian-core.spec b/xapian-core.spec
index 4e7d1b5..f056c45 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
-Version: 1.2.17
-Release: 3%{?dist}
+Version: 1.2.18
+Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -10,7 +10,8 @@ Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.t
BuildRequires: zlib-devel
BuildRequires: libuuid-devel
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
%description
Xapian is an Open Source Probabilistic Information Retrieval Library. It
@@ -30,8 +31,8 @@ libraries for applications using Xapian functionality
%package devel
Group: Development/Libraries
Summary: Files needed for building packages which use Xapian
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -100,6 +101,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Mon Sep 1 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.18-1
+- Update to 1.2.18
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.17-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
--
cgit v0.10.2
From ae284ab237993f28739ddc5e7096a41a915deb34 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Tue, 11 Nov 2014 10:16:47 +0000
Subject: 1.2.19
diff --git a/sources b/sources
index f24e653..0a32741 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ccbf68ade12e7b1ead10c57f4447899 xapian-core-1.2.18.tar.xz
+54ec8333757eb94dbde76d31d185af91 xapian-core-1.2.19.tar.xz
diff --git a/xapian-core.spec b/xapian-core.spec
index f056c45..489e181 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,5 +1,5 @@
Name: xapian-core
-Version: 1.2.18
+Version: 1.2.19
Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
@@ -101,6 +101,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Tue Nov 11 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.19-1
+- Update to 1.2.19
+
* Mon Sep 1 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.18-1
- Update to 1.2.18
--
cgit v0.10.2
From 7deca638626d888d916dcda61eaff44b55097c00 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 7 Feb 2015 11:45:35 -0600
Subject: rebuild (gcc)
Fixes:
#error The C++ ABI version of compiler you are using does not match
#error that of the compiler used to build the library. The versions
#error must match or your program will not work correctly.
error The Xapian library was built with g++ 4.9.2
diff --git a/xapian-core.spec b/xapian-core.spec
index 489e181..d23aa95 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.19
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -101,6 +101,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Sat Feb 07 2015 Rex Dieter <rdieter at fedoraproject.org> 1.2.19-2
+- rebuild (gcc)
+
* Tue Nov 11 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.19-1
- Update to 1.2.19
--
cgit v0.10.2
From 5a0ce6e6c825658cf9016037fd70508142cbf1e2 Mon Sep 17 00:00:00 2001
From: Than Ngo <than at redhat.com>
Date: Wed, 25 Feb 2015 12:02:36 +0100
Subject: rebuilt against new gcc5
diff --git a/xapian-core.spec b/xapian-core.spec
index d23aa95..aad0cb1 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.19
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -101,6 +101,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Wed Feb 25 2015 Than Ngo <than at redhat.com> 1.2.19-3
+- rebuilt against new gcc5
+
* Sat Feb 07 2015 Rex Dieter <rdieter at fedoraproject.org> 1.2.19-2
- rebuild (gcc)
--
cgit v0.10.2
From 22147b0965c62436d1f681c69a5212f62d4f24a7 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Sat, 21 Mar 2015 14:29:10 +0000
Subject: 1.2.20
diff --git a/sources b/sources
index 0a32741..9278f2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54ec8333757eb94dbde76d31d185af91 xapian-core-1.2.19.tar.xz
+eecb650d8b73e09a63f32140f2d810ce xapian-core-1.2.20.tar.xz
diff --git a/xapian-core.spec b/xapian-core.spec
index aad0cb1..8e38a58 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
-Version: 1.2.19
-Release: 3%{?dist}
+Version: 1.2.20
+Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -33,6 +33,7 @@ Group: Development/Libraries
Summary: Files needed for building packages which use Xapian
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: libuuid-devel
%description devel
Xapian is an Open Source Probabilistic Information Retrieval framework. It
@@ -61,7 +62,7 @@ make %{?_smp_mflags} V=1
make install DESTDIR=%{buildroot} INSTALL='install -p'
# Remove libtool archives
-# find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -name '*.la' -delete
# Remove the dev docs, we pick them up below
rm -rf %{buildroot}%{_datadir}/doc/%{name}
@@ -94,13 +95,16 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_includedir}/xapian
%{_includedir}/xapian.h
%{_libdir}/libxapian.so
-%{_libdir}/libxapian.la
%{_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
+* Sat Mar 21 2015 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.20-1
+- Update to 1.2.20
+
* Wed Feb 25 2015 Than Ngo <than at redhat.com> 1.2.19-3
- rebuilt against new gcc5
--
cgit v0.10.2
From e2396321ed77b9b1a58f31943c61099faeb69670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Wed, 15 Apr 2015 14:13:05 +0200
Subject: Rebuild owing to C++ ABI change in GCC-5
diff --git a/xapian-core.spec b/xapian-core.spec
index 8e38a58..c355518 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
Version: 1.2.20
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -102,6 +102,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Wed Apr 15 2015 Petr Pisar <ppisar at redhat.com> - 1.2.20-2
+- Rebuild owing to C++ ABI change in GCC-5 (bug #1195353)
+
* Sat Mar 21 2015 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.20-1
- Update to 1.2.20
--
cgit v0.10.2
From 3cf3c6395e6c370684bc513cf57b329c55b9d3e3 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Mon, 15 Jun 2015 10:15:10 +0100
Subject: 1.2.21
diff --git a/sources b/sources
index 9278f2a..bb48125 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eecb650d8b73e09a63f32140f2d810ce xapian-core-1.2.20.tar.xz
+276497a458a8ae63e7dceb372cc1bc37 xapian-core-1.2.21.tar.xz
diff --git a/xapian-core.spec b/xapian-core.spec
index c355518..92c913f 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,6 +1,6 @@
Name: xapian-core
-Version: 1.2.20
-Release: 2%{?dist}
+Version: 1.2.21
+Release: 1%{?dist}
Summary: The Xapian Probabilistic Information Retrieval Library
Group: Applications/Databases
@@ -102,6 +102,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{_mandir}/man1/xapian-config.1*
%changelog
+* Mon Jun 15 2015 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.21-1
+- Update to 1.2.21
+
* Wed Apr 15 2015 Petr Pisar <ppisar at redhat.com> - 1.2.20-2
- Rebuild owing to C++ ABI change in GCC-5 (bug #1195353)
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xapian-core.git/commit/?h=el6&id=e9159f5dcd845173c90c854d1d57a1af37f06186
More information about the scm-commits
mailing list