From 11c311d5a23d2612b3565f378530857f34f09895 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 16 Apr 2019 13:54:33 +0100 Subject: [PATCH 01/42] 1.4.11 --- sources | 2 +- xapian-core.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a4214a8..1f065cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.10.tar.xz) = fa716d6f8c04edb297d99dad4d7835f7874837ab3c39d7017e43708cde6992c596e579418be17b79772e002bd23b94169812523a1abd9519b1dd3df474f027d9 +SHA512 (xapian-core-1.4.11.tar.xz) = 72ab7b0c774390f38319d241689b2dc3c2837fbbf933616574f6ad167f14a25c2eff747910022065508dc7c44f806dc2b71dae80a1b4f1f47e1675fb951bc785 diff --git a/xapian-core.spec b/xapian-core.spec index 88a3017..752e28d 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -1,5 +1,5 @@ Name: xapian-core -Version: 1.4.10 +Version: 1.4.11 Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ @@ -102,6 +102,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_mandir}/man1/xapian-config.1* %changelog +* Tue Apr 16 2019 Peter Robinson 1.4.11-1 +- Update to 1.4.11 + * Mon Feb 11 2019 Peter Robinson 1.4.10-1 - Update to 1.4.10 From 169e6be87191dcb9dc585cef698ecf73a785241f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:51:05 +0000 Subject: [PATCH 02/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index 752e28d..6864bda 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -1,6 +1,6 @@ Name: xapian-core Version: 1.4.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ URL: http://www.xapian.org/ @@ -102,6 +102,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_mandir}/man1/xapian-config.1* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.4.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Apr 16 2019 Peter Robinson 1.4.11-1 - Update to 1.4.11 From 787aa3be3ed279c7bf3c5542a8db68ce424da82e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 20 Aug 2019 23:08:13 +0100 Subject: [PATCH 03/42] 1.4.12 --- sources | 2 +- xapian-core.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 1f065cd..bbeac53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.11.tar.xz) = 72ab7b0c774390f38319d241689b2dc3c2837fbbf933616574f6ad167f14a25c2eff747910022065508dc7c44f806dc2b71dae80a1b4f1f47e1675fb951bc785 +SHA512 (xapian-core-1.4.12.tar.xz) = 230b39e012366267cf5ea09d01d3b463818c0d05861b8c8643bc6fc238be21bd3f4862adeba864b4af2962b1c0748b3d380dfe845da467f5164b0d938288c430 diff --git a/xapian-core.spec b/xapian-core.spec index 6864bda..5f65d4c 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -1,6 +1,6 @@ Name: xapian-core -Version: 1.4.11 -Release: 2%{?dist} +Version: 1.4.12 +Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ URL: http://www.xapian.org/ @@ -102,6 +102,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_mandir}/man1/xapian-config.1* %changelog +* Tue Aug 20 2019 Peter Robinson 1.4.12-1 +- Update to 1.4.12 + * Sat Jul 27 2019 Fedora Release Engineering - 1.4.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From a36b336eb4f16bd4323b4f9963028ab26f08c671 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 17 Oct 2019 11:51:59 +0100 Subject: [PATCH 04/42] 1.4.13 --- sources | 2 +- xapian-core.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index bbeac53..93f5a0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.12.tar.xz) = 230b39e012366267cf5ea09d01d3b463818c0d05861b8c8643bc6fc238be21bd3f4862adeba864b4af2962b1c0748b3d380dfe845da467f5164b0d938288c430 +SHA512 (xapian-core-1.4.13.tar.xz) = aa7b2262dd9d631339131e814f7c96acd85e386a4c4b6331eff86fc7227663589132779bd6b8c340a2b6f19bd66f8b53acbbe5bc985c74f9bdbe3ce3ccf4c1e7 diff --git a/xapian-core.spec b/xapian-core.spec index 5f65d4c..ed68998 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -1,5 +1,5 @@ Name: xapian-core -Version: 1.4.12 +Version: 1.4.13 Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ @@ -102,6 +102,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_mandir}/man1/xapian-config.1* %changelog +* Thu Oct 17 2019 Peter Robinson 1.4.13-1 +- Update to 1.4.13 + * Tue Aug 20 2019 Peter Robinson 1.4.12-1 - Update to 1.4.12 From c2b31695594e7837f861090e1a4a42d9e61ad5c6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 29 Oct 2019 09:58:04 +0000 Subject: [PATCH 05/42] Upstream fix for pruning under a positional check (rhbz 1766219) --- ...23d13267c5cacf0626fbab89209b2e891848.patch | 94 +++++++++++++++++++ xapian-core.spec | 8 +- 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 xapian-core-f4ed23d13267c5cacf0626fbab89209b2e891848.patch diff --git a/xapian-core-f4ed23d13267c5cacf0626fbab89209b2e891848.patch b/xapian-core-f4ed23d13267c5cacf0626fbab89209b2e891848.patch new file mode 100644 index 0000000..cc5037c --- /dev/null +++ b/xapian-core-f4ed23d13267c5cacf0626fbab89209b2e891848.patch @@ -0,0 +1,94 @@ +Index: xapian-core/matcher/multimatch.cc +=================================================================== +--- xapian-core/matcher/multimatch.cc (revision bf5fa7db9e707a190e6ee0883c951a2a06cfaf1c) ++++ xapian-core/matcher/multimatch.cc (revision f4ed23d13267c5cacf0626fbab89209b2e891848) +@@ -367,5 +367,13 @@ + wt = pl->get_maxweight(); + LOGLINE(MATCH, "pl = (" << pl->get_description() << ")"); +- AssertEqDoubleParanoid(wt, pl->recalc_maxweight()); ++ // FIXME: This fails for hoistnotbug1 under multi_remoteprog_glass: ++ // AssertionError: matcher/multimatch.cc:370: within_DBL_EPSILON(wt, pl->recalc_maxweight()) : values were 2.7075940282079162813 and 2.6966211268553141878 ++ // ++ // AssertEqDoubleParanoid(wt, pl->recalc_maxweight()); ++ // ++ // Not sure why - adding code to call recalc_maxweight() doesn't seem ++ // to help. But the max weight not being as low as it could be is ++ // only a potential missed optimisation opportunity, not a correctness ++ // issue. + } + LOGLINE(MATCH, "max possible doc weight = " << wt); +Index: xapian-core/matcher/selectpostlist.cc +=================================================================== +--- xapian-core/matcher/selectpostlist.cc (revision bf5fa7db9e707a190e6ee0883c951a2a06cfaf1c) ++++ xapian-core/matcher/selectpostlist.cc (revision f4ed23d13267c5cacf0626fbab89209b2e891848) +@@ -3,5 +3,5 @@ + * Copyright 1999,2000,2001 BrightStation PLC + * Copyright 2002 Ananova Ltd +- * Copyright 2003,2004,2007,2010,2011,2012,2013 Olly Betts ++ * Copyright 2003,2004,2007,2010,2011,2012,2013,2019 Olly Betts + * + * This program is free software; you can redistribute it and/or +@@ -25,5 +25,4 @@ + + #include "debuglog.h" +-#include "omassert.h" + + PostList * +@@ -33,6 +32,8 @@ + do { + PostList *p = source->next(w_min); +- (void)p; +- Assert(p == NULL); // AND should never prune ++ if (p) { ++ delete source; ++ source = p; ++ } + wt = -1; + } while (!source->at_end() && (!check_weight(w_min) || !test_doc())); +@@ -46,6 +47,8 @@ + if (did > get_docid()) { + PostList *p = source->skip_to(did, w_min); +- (void)p; +- Assert(p == NULL); // AND should never prune ++ if (p) { ++ delete source; ++ source = p; ++ } + wt = -1; + if (!source->at_end() && (!check_weight(w_min) || !test_doc())) +@@ -60,6 +63,8 @@ + LOGCALL(MATCH, PostList *, "SelectPostList::check", did | w_min | valid); + PostList *p = source->check(did, w_min, valid); +- (void)p; +- Assert(p == NULL); // AND should never prune ++ if (p) { ++ delete source; ++ source = p; ++ } + wt = -1; + if (valid && !source->at_end() && (!check_weight(w_min) || !test_doc())) +Index: xapian-core/tests/api_query.cc +=================================================================== +--- xapian-core/tests/api_query.cc (revision bf5fa7db9e707a190e6ee0883c951a2a06cfaf1c) ++++ xapian-core/tests/api_query.cc (revision f4ed23d13267c5cacf0626fbab89209b2e891848) +@@ -836,2 +836,20 @@ + return true; + } ++ ++// Regression test for bug introduced in 1.4.13 and fixed in 1.4.14. ++DEFINE_TESTCASE(hoistnotbug1, backend) { ++ Xapian::Database db(get_database("etext")); ++ using Xapian::Query; ++ Query q(Query::OP_PHRASE, Query("the"), Query("king")); ++ q &= ~Query("worldtornado"); ++ q &= Query("a"); ++ Xapian::Enquire enq(db); ++ enq.set_query(q); ++ ++ // This reliably fails before the fix in an assertion build, and may crash ++ // in other builds. ++ Xapian::MSet mset = enq.get_mset(0, 10, db.get_doccount()); ++ TEST_EQUAL(mset.get_matches_estimated(), 42); ++ ++ return true; ++} diff --git a/xapian-core.spec b/xapian-core.spec index ed68998..931e8f7 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -1,10 +1,12 @@ Name: xapian-core Version: 1.4.13 -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 +# https://trac.xapian.org/changeset/f4ed23d13267c5cacf0626fbab89209b2e891848/git +Patch1: xapian-core-f4ed23d13267c5cacf0626fbab89209b2e891848.patch BuildRequires: gcc gcc-c++ BuildRequires: libuuid-devel @@ -45,6 +47,7 @@ files needed for building packages which use Xapian %prep %setup -q +%patch1 -p1 -b .notmuch %build # Disable SSE on x86, but leave it intact for x86_64 @@ -102,6 +105,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_mandir}/man1/xapian-config.1* %changelog +* Tue Oct 29 2019 Peter Robinson - 1.4.13-2 +- Upstream fix for pruning under a positional check (rhbz 1766219) + * Thu Oct 17 2019 Peter Robinson 1.4.13-1 - Update to 1.4.13 From e4bbf803cb005c84856f2f45c081a3b8903ed013 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:04:39 +0000 Subject: [PATCH 06/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index 931e8f7..a246672 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -1,6 +1,6 @@ Name: xapian-core Version: 1.4.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ URL: http://www.xapian.org/ @@ -105,6 +105,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_mandir}/man1/xapian-config.1* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.4.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Oct 29 2019 Peter Robinson - 1.4.13-2 - Upstream fix for pruning under a positional check (rhbz 1766219) From ddf8adc561619b1542d947d8fd7b8c2f029b54a7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 10 Feb 2020 12:57:38 +0000 Subject: [PATCH 07/42] 1.4.14 --- sources | 2 +- ...23d13267c5cacf0626fbab89209b2e891848.patch | 94 ------------------- xapian-core.spec | 16 ++-- 3 files changed, 9 insertions(+), 103 deletions(-) delete mode 100644 xapian-core-f4ed23d13267c5cacf0626fbab89209b2e891848.patch diff --git a/sources b/sources index 93f5a0e..3ff5f36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.13.tar.xz) = aa7b2262dd9d631339131e814f7c96acd85e386a4c4b6331eff86fc7227663589132779bd6b8c340a2b6f19bd66f8b53acbbe5bc985c74f9bdbe3ce3ccf4c1e7 +SHA512 (xapian-core-1.4.14.tar.xz) = c08c9abe87e08491566b7cfa8cda9e2a80e4959a647428b6d82bce7af1c967b4cb463607ffb8976372a980c163923ced36117a66e0b5a1f35659393def3d371b diff --git a/xapian-core-f4ed23d13267c5cacf0626fbab89209b2e891848.patch b/xapian-core-f4ed23d13267c5cacf0626fbab89209b2e891848.patch deleted file mode 100644 index cc5037c..0000000 --- a/xapian-core-f4ed23d13267c5cacf0626fbab89209b2e891848.patch +++ /dev/null @@ -1,94 +0,0 @@ -Index: xapian-core/matcher/multimatch.cc -=================================================================== ---- xapian-core/matcher/multimatch.cc (revision bf5fa7db9e707a190e6ee0883c951a2a06cfaf1c) -+++ xapian-core/matcher/multimatch.cc (revision f4ed23d13267c5cacf0626fbab89209b2e891848) -@@ -367,5 +367,13 @@ - wt = pl->get_maxweight(); - LOGLINE(MATCH, "pl = (" << pl->get_description() << ")"); -- AssertEqDoubleParanoid(wt, pl->recalc_maxweight()); -+ // FIXME: This fails for hoistnotbug1 under multi_remoteprog_glass: -+ // AssertionError: matcher/multimatch.cc:370: within_DBL_EPSILON(wt, pl->recalc_maxweight()) : values were 2.7075940282079162813 and 2.6966211268553141878 -+ // -+ // AssertEqDoubleParanoid(wt, pl->recalc_maxweight()); -+ // -+ // Not sure why - adding code to call recalc_maxweight() doesn't seem -+ // to help. But the max weight not being as low as it could be is -+ // only a potential missed optimisation opportunity, not a correctness -+ // issue. - } - LOGLINE(MATCH, "max possible doc weight = " << wt); -Index: xapian-core/matcher/selectpostlist.cc -=================================================================== ---- xapian-core/matcher/selectpostlist.cc (revision bf5fa7db9e707a190e6ee0883c951a2a06cfaf1c) -+++ xapian-core/matcher/selectpostlist.cc (revision f4ed23d13267c5cacf0626fbab89209b2e891848) -@@ -3,5 +3,5 @@ - * Copyright 1999,2000,2001 BrightStation PLC - * Copyright 2002 Ananova Ltd -- * Copyright 2003,2004,2007,2010,2011,2012,2013 Olly Betts -+ * Copyright 2003,2004,2007,2010,2011,2012,2013,2019 Olly Betts - * - * This program is free software; you can redistribute it and/or -@@ -25,5 +25,4 @@ - - #include "debuglog.h" --#include "omassert.h" - - PostList * -@@ -33,6 +32,8 @@ - do { - PostList *p = source->next(w_min); -- (void)p; -- Assert(p == NULL); // AND should never prune -+ if (p) { -+ delete source; -+ source = p; -+ } - wt = -1; - } while (!source->at_end() && (!check_weight(w_min) || !test_doc())); -@@ -46,6 +47,8 @@ - if (did > get_docid()) { - PostList *p = source->skip_to(did, w_min); -- (void)p; -- Assert(p == NULL); // AND should never prune -+ if (p) { -+ delete source; -+ source = p; -+ } - wt = -1; - if (!source->at_end() && (!check_weight(w_min) || !test_doc())) -@@ -60,6 +63,8 @@ - LOGCALL(MATCH, PostList *, "SelectPostList::check", did | w_min | valid); - PostList *p = source->check(did, w_min, valid); -- (void)p; -- Assert(p == NULL); // AND should never prune -+ if (p) { -+ delete source; -+ source = p; -+ } - wt = -1; - if (valid && !source->at_end() && (!check_weight(w_min) || !test_doc())) -Index: xapian-core/tests/api_query.cc -=================================================================== ---- xapian-core/tests/api_query.cc (revision bf5fa7db9e707a190e6ee0883c951a2a06cfaf1c) -+++ xapian-core/tests/api_query.cc (revision f4ed23d13267c5cacf0626fbab89209b2e891848) -@@ -836,2 +836,20 @@ - return true; - } -+ -+// Regression test for bug introduced in 1.4.13 and fixed in 1.4.14. -+DEFINE_TESTCASE(hoistnotbug1, backend) { -+ Xapian::Database db(get_database("etext")); -+ using Xapian::Query; -+ Query q(Query::OP_PHRASE, Query("the"), Query("king")); -+ q &= ~Query("worldtornado"); -+ q &= Query("a"); -+ Xapian::Enquire enq(db); -+ enq.set_query(q); -+ -+ // This reliably fails before the fix in an assertion build, and may crash -+ // in other builds. -+ Xapian::MSet mset = enq.get_mset(0, 10, db.get_doccount()); -+ TEST_EQUAL(mset.get_matches_estimated(), 42); -+ -+ return true; -+} diff --git a/xapian-core.spec b/xapian-core.spec index a246672..81bb385 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -1,12 +1,10 @@ Name: xapian-core -Version: 1.4.13 -Release: 3%{?dist} +Version: 1.4.14 +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 -# https://trac.xapian.org/changeset/f4ed23d13267c5cacf0626fbab89209b2e891848/git -Patch1: xapian-core-f4ed23d13267c5cacf0626fbab89209b2e891848.patch BuildRequires: gcc gcc-c++ BuildRequires: libuuid-devel @@ -46,8 +44,7 @@ indexing and search facilities to applications. This package provides the files needed for building packages which use Xapian %prep -%setup -q -%patch1 -p1 -b .notmuch +%autosetup -p1 %build # Disable SSE on x86, but leave it intact for x86_64 @@ -61,10 +58,10 @@ files needed for building packages which use Xapian 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 -make %{?_smp_mflags} V=1 +%{make_build} %install -make install DESTDIR=%{buildroot} INSTALL='install -p' +%{make_install} # Remove libtool archives find $RPM_BUILD_ROOT -name '*.la' -delete @@ -105,6 +102,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_mandir}/man1/xapian-config.1* %changelog +* Mon Feb 10 2020 Peter Robinson 1.4.14-1 +- Update to 1.4.14 + * Fri Jan 31 2020 Fedora Release Engineering - 1.4.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From c9cd6307e7d6efde4cb816a641beedb6ce734575 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:26:17 +0000 Subject: [PATCH 08/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index 81bb385..82f019d 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -1,6 +1,6 @@ Name: xapian-core Version: 1.4.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ URL: http://www.xapian.org/ @@ -102,6 +102,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_mandir}/man1/xapian-config.1* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.4.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Feb 10 2020 Peter Robinson 1.4.14-1 - Update to 1.4.14 From 286444c0a6395be6eb0951f7e5d8e12a98f09ea6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 21 Sep 2020 16:05:25 +0100 Subject: [PATCH 09/42] 1.4.17 --- sources | 2 +- xapian-core.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 3ff5f36..c5b746e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.14.tar.xz) = c08c9abe87e08491566b7cfa8cda9e2a80e4959a647428b6d82bce7af1c967b4cb463607ffb8976372a980c163923ced36117a66e0b5a1f35659393def3d371b +SHA512 (xapian-core-1.4.17.tar.xz) = 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7 diff --git a/xapian-core.spec b/xapian-core.spec index 82f019d..001329a 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -1,6 +1,6 @@ Name: xapian-core -Version: 1.4.14 -Release: 2%{?dist} +Version: 1.4.17 +Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ URL: http://www.xapian.org/ @@ -102,6 +102,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_mandir}/man1/xapian-config.1* %changelog +* Mon Sep 21 2020 Peter Robinson - 1.4.17-1 +- Update to 1.4.17 + * Wed Jul 29 2020 Fedora Release Engineering - 1.4.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 87cd86a4a5e63e6d1f3a6ed51e4a8f9320c8a237 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sat, 17 Oct 2020 16:21:07 -0600 Subject: [PATCH 10/42] Add missing #include for gcc-11 --- xapian-core-gcc11.patch | 12 ++++++++++++ xapian-core.spec | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 xapian-core-gcc11.patch diff --git a/xapian-core-gcc11.patch b/xapian-core-gcc11.patch new file mode 100644 index 0000000..a91a738 --- /dev/null +++ b/xapian-core-gcc11.patch @@ -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 + #include ++#include + + using namespace std; + diff --git a/xapian-core.spec b/xapian-core.spec index 001329a..25101e1 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -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 - 1.4.17-2 +- Fix missing #include for gcc-11 + * Mon Sep 21 2020 Peter Robinson - 1.4.17-1 - Update to 1.4.17 From ef1cab95db0b7b9bd6dda33b1a620ba1c7941bee Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:06:41 +0000 Subject: [PATCH 11/42] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xapian-core.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xapian-core.spec b/xapian-core.spec index 25101e1..3bc9221 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,6 +7,7 @@ URL: http://www.xapian.org/ Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz Patch0: %{name}-gcc11.patch +BuildRequires: make BuildRequires: gcc gcc-c++ BuildRequires: libuuid-devel BuildRequires: zlib-devel From 485f7d4453aca3b7cf84c7ee7f4a313cd9ef1ce4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:46:44 +0000 Subject: [PATCH 12/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index 3bc9221..39f1c2c 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -1,6 +1,6 @@ Name: xapian-core Version: 1.4.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ URL: http://www.xapian.org/ @@ -104,6 +104,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_mandir}/man1/xapian-config.1* %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.4.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Oct 17 2020 Jeff Law - 1.4.17-2 - Fix missing #include for gcc-11 From 46982e6ea5a177c729dd079ec983c510d052cb65 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 7 Mar 2021 15:16:18 +0000 Subject: [PATCH 13/42] 1.4.18, spec cleanups --- 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 - #include -+#include - - 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 - 1.4.18-1 +- Update to 1.4.18 +- Spec file cleanups + * Wed Jan 27 2021 Fedora Release Engineering - 1.4.17-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From b68ef2f1a6a7763fb81a98dab0e2f57ba15407db Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sat, 26 Jun 2021 17:25:26 +0200 Subject: [PATCH 14/42] * Rebuild with C++ 11.1 --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index da33b3f..7f27187 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,7 +7,7 @@ Name: xapian-core Version: 1.4.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Sat Jun 26 2021 Denis Arnaud - 1.4.18-2 +* Rebuild with C++ 11.1 + * Sun Mar 07 2021 Peter Robinson - 1.4.18-1 - Update to 1.4.18 - Spec file cleanups From 56bda677be95f395864211e21c4fdaf3c5d408c4 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sat, 26 Jun 2021 17:35:51 +0200 Subject: [PATCH 15/42] Fixed the change log --- xapian-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index 7f27187..e1bcffc 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -104,7 +104,7 @@ make check %{?_smp_mflags} %changelog * Sat Jun 26 2021 Denis Arnaud - 1.4.18-2 -* Rebuild with C++ 11.1 +- Rebuild with C++ 11.1 * Sun Mar 07 2021 Peter Robinson - 1.4.18-1 - Update to 1.4.18 From c7aa0be743d255b946d3f8a70c4f8e1fa4a05483 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:15:56 +0000 Subject: [PATCH 16/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index e1bcffc..e5affcb 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,7 +7,7 @@ Name: xapian-core Version: 1.4.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jun 26 2021 Denis Arnaud - 1.4.18-2 - Rebuild with C++ 11.1 From 8940f05cc883618936a66314f737781ba1d82e41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:47:31 +0000 Subject: [PATCH 17/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index e5affcb..a8f6e40 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,7 +7,7 @@ Name: xapian-core Version: 1.4.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.4.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.4.18-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e95e6b2a3d63834aa6169070854eab1024ca75bd Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 29 Mar 2022 20:36:51 +0100 Subject: [PATCH 18/42] 1.4.19 --- xapian-core.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xapian-core.spec b/xapian-core.spec index a8f6e40..611faf9 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -6,8 +6,8 @@ %endif Name: xapian-core -Version: 1.4.18 -Release: 4%{?dist} +Version: 1.4.19 +Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Tue Mar 29 2022 Peter Robinson - 1.4.19-1 +- Update to 1.4.19 + * Sat Jan 22 2022 Fedora Release Engineering - 1.4.18-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 5335a7d57939ac7e083f19cc1e5168e55d05783c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 29 Mar 2022 20:41:47 +0100 Subject: [PATCH 19/42] Upload 1.4.19 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 011a484..2ef4713 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.18.tar.xz) = ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef +SHA512 (xapian-core-1.4.19.tar.xz) = d596058d7f9bfa0b73c5b6354331a799936b45f27012894f6792872ade8656bb0387b504aea8c1c3edfbd48787190452e7a49d2b62d181cb050c46edd3e67346 From 5115c6147fc892ce35e4f0c4d0531315ef240fc7 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Thu, 14 Jul 2022 13:51:43 +0200 Subject: [PATCH 20/42] [Git] Ignored expanded source directories --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index dab2046..95dcae6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xapian-core-*.tar.* +xapian-core-?.?.??/ From 2a1bb5b6cb7ba70705ff822c1b8e87e16a94d5e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:46:11 +0000 Subject: [PATCH 21/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index 611faf9..436aa77 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,7 +7,7 @@ Name: xapian-core Version: 1.4.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.4.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Mar 29 2022 Peter Robinson - 1.4.19-1 - Update to 1.4.19 From 06591eed1de531b26c48b39c204218d4e0a9530d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 2 Aug 2022 09:17:48 +0100 Subject: [PATCH 22/42] 1.4.20 --- sources | 2 +- xapian-core.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 2ef4713..6c06766 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.19.tar.xz) = d596058d7f9bfa0b73c5b6354331a799936b45f27012894f6792872ade8656bb0387b504aea8c1c3edfbd48787190452e7a49d2b62d181cb050c46edd3e67346 +SHA512 (xapian-core-1.4.20.tar.xz) = e2f62eebc946cc5d0641db85d2966e6ad9e84c6a23606e705f0461ab80b012933b46ed5b7e0691fe2070ca1c0755e99895c18bc055eaad0a9376def410aa7f35 diff --git a/xapian-core.spec b/xapian-core.spec index 436aa77..b79ea35 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -6,8 +6,8 @@ %endif Name: xapian-core -Version: 1.4.19 -Release: 2%{?dist} +Version: 1.4.20 +Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Tue Aug 02 2022 Peter Robinson - 1.4.20-1 +- Update to 1.4.20 + * Sat Jul 23 2022 Fedora Release Engineering - 1.4.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 2b55ab0b8b9381d3ff28506726e1fa0fc69c3d7a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:07:59 +0000 Subject: [PATCH 23/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index b79ea35..810e66c 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,7 +7,7 @@ Name: xapian-core Version: 1.4.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPLv2+ URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.4.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Aug 02 2022 Peter Robinson - 1.4.20-1 - Update to 1.4.20 From d36533f5bc389213ff799147adc0eefd9c2b497b Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 21 Feb 2023 19:29:35 +0100 Subject: [PATCH 24/42] migrated to SPDX license --- xapian-core.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xapian-core.spec b/xapian-core.spec index 810e66c..7b6c5f5 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,9 +7,9 @@ Name: xapian-core Version: 1.4.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library -License: GPLv2+ +License: GPL-2.0-or-later URL: https://www.xapian.org/ Source0: https://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Tue Feb 21 2023 Than Ngo - 1.4.20-3 +- migrated to SPDX license + * Sat Jan 21 2023 Fedora Release Engineering - 1.4.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From c4e4093d2dde6482f61ab43b114c4c81840b296b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 18 May 2023 09:56:14 +0100 Subject: [PATCH 25/42] 1.4.22 --- sources | 2 +- xapian-core.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 6c06766..bf2fd1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.20.tar.xz) = e2f62eebc946cc5d0641db85d2966e6ad9e84c6a23606e705f0461ab80b012933b46ed5b7e0691fe2070ca1c0755e99895c18bc055eaad0a9376def410aa7f35 +SHA512 (xapian-core-1.4.22.tar.xz) = 60d66adbacbd59622d25e392060984bd1dc6c870f9031765f54cb335fb29f72f6d006d27af82a50c8da2cfbebd08dac4503a8afa8ad51bc4e6fa9cb367a59d29 diff --git a/xapian-core.spec b/xapian-core.spec index 7b6c5f5..725294f 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -6,8 +6,8 @@ %endif Name: xapian-core -Version: 1.4.20 -Release: 3%{?dist} +Version: 1.4.22 +Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Thu May 18 2023 Peter Robinson - 1.4.22-1 +- Update to 1.4.22 + * Tue Feb 21 2023 Than Ngo - 1.4.20-3 - migrated to SPDX license From 23600459663bc383d0051dfe21db5a7679fde3fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:30:17 +0000 Subject: [PATCH 26/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index 725294f..df697b4 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,7 +7,7 @@ Name: xapian-core Version: 1.4.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.4.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu May 18 2023 Peter Robinson - 1.4.22-1 - Update to 1.4.22 From 105b3509426488fc3dc40850e6371968df787539 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 25 Jul 2023 14:36:19 +0100 Subject: [PATCH 27/42] 1.4.23 --- sources | 2 +- xapian-core.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index bf2fd1c..9fce49a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.22.tar.xz) = 60d66adbacbd59622d25e392060984bd1dc6c870f9031765f54cb335fb29f72f6d006d27af82a50c8da2cfbebd08dac4503a8afa8ad51bc4e6fa9cb367a59d29 +SHA512 (xapian-core-1.4.23.tar.xz) = 52dffc93301f99aa150dda8ecd5fb7cc7d0f2ce30e60f393b1058055ade24281af16cf5b5c0e6b08e4754e3d18c39bb5bc068b19330a294ad460ef8a6bc56380 diff --git a/xapian-core.spec b/xapian-core.spec index df697b4..3715f15 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -6,8 +6,8 @@ %endif Name: xapian-core -Version: 1.4.22 -Release: 2%{?dist} +Version: 1.4.23 +Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Tue Jul 25 2023 Peter Robinson - 1.4.23-1 +- Update 1.4.23 + * Sat Jul 22 2023 Fedora Release Engineering - 1.4.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 1b58952167606506f3ab36ab27345bca60d3dbf5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:18:47 +0000 Subject: [PATCH 28/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index 3715f15..86fbbf0 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,7 +7,7 @@ Name: xapian-core Version: 1.4.23 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.4.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jul 25 2023 Peter Robinson - 1.4.23-1 - Update 1.4.23 From 0e3be569880bdea7790856f32bed53260473b507 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:41:39 +0000 Subject: [PATCH 29/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index 86fbbf0..5c14179 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,7 +7,7 @@ Name: xapian-core Version: 1.4.23 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.4.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.4.23-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6e43e58a2ba7375a5ba0e099bc612d8fba652867 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 16 Aug 2024 17:40:55 +0100 Subject: [PATCH 30/42] 1.4.26 --- sources | 2 +- xapian-core.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 9fce49a..2da6d30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.23.tar.xz) = 52dffc93301f99aa150dda8ecd5fb7cc7d0f2ce30e60f393b1058055ade24281af16cf5b5c0e6b08e4754e3d18c39bb5bc068b19330a294ad460ef8a6bc56380 +SHA512 (xapian-core-1.4.26.tar.xz) = ecd94d410dc94b6510c6729f276606987f9dd955cfb0520e62d46fa71645f5b140d474cda0d77078e64ee7cf9c0cd00f3aefe0e1b087739582e64bbcb9fabd4b diff --git a/xapian-core.spec b/xapian-core.spec index 5c14179..298c750 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -6,8 +6,8 @@ %endif Name: xapian-core -Version: 1.4.23 -Release: 3%{?dist} +Version: 1.4.26 +Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Fri Aug 16 2024 Peter Robinson - 1.4.26-1 +- Update to 1.4.26 + * Sat Jul 20 2024 Fedora Release Engineering - 1.4.23-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1e8e575c6a7395b7812ada1f9c599f3cec5e1552 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:24:28 +0000 Subject: [PATCH 31/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index 298c750..79b78c7 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,7 +7,7 @@ Name: xapian-core Version: 1.4.26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.4.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Aug 16 2024 Peter Robinson - 1.4.26-1 - Update to 1.4.26 From 3118d15ca98e0d100c498dac47771b42fc9c965a Mon Sep 17 00:00:00 2001 From: Christiano Anderson Date: Sun, 30 Mar 2025 10:34:25 +0200 Subject: [PATCH 32/42] Update to 1.4.27 --- sources | 2 +- xapian-core.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 2da6d30..2adbedc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.26.tar.xz) = ecd94d410dc94b6510c6729f276606987f9dd955cfb0520e62d46fa71645f5b140d474cda0d77078e64ee7cf9c0cd00f3aefe0e1b087739582e64bbcb9fabd4b +SHA512 (xapian-core-1.4.27.tar.xz) = 5a9b75dfc61782012c4c2febd95532e6705f7fa45b0765b64dbc9ee3751c88fb3420f1d7d8fdadee21a59ff4143c5197870a4aa50993490a033fce6925e1e9f1 diff --git a/xapian-core.spec b/xapian-core.spec index 79b78c7..e87ed16 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -6,8 +6,8 @@ %endif Name: xapian-core -Version: 1.4.26 -Release: 2%{?dist} +Version: 1.4.27 +Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Sun Mar 30 2025 Christiano Anderson - 1.4.27-1 +- Update to 1.4.27 + * Sun Jan 19 2025 Fedora Release Engineering - 1.4.26-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7f021bc64cf6ae9f19afab6ed51d23e69c23290c Mon Sep 17 00:00:00 2001 From: Christiano Anderson Date: Thu, 1 May 2025 09:06:50 +0200 Subject: [PATCH 33/42] Update to 1.4.29 --- sources | 2 +- xapian-core.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2adbedc..51d575c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.27.tar.xz) = 5a9b75dfc61782012c4c2febd95532e6705f7fa45b0765b64dbc9ee3751c88fb3420f1d7d8fdadee21a59ff4143c5197870a4aa50993490a033fce6925e1e9f1 +SHA512 (xapian-core-1.4.29.tar.xz) = fe368f0b9b840d73f1d550814a8954cf3e0ee1f89206db8b2b00b82ed8abe93b890193f9bf10b801125c87438497640fd10e742b2f616dd69cdcb694757ed38d diff --git a/xapian-core.spec b/xapian-core.spec index e87ed16..51fb5a2 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -6,7 +6,7 @@ %endif Name: xapian-core -Version: 1.4.27 +Version: 1.4.29 Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Thu May 01 2025 Christiano Anderson - 1.4.29-1 +- Update to 1.4.29 + * Sun Mar 30 2025 Christiano Anderson - 1.4.27-1 - Update to 1.4.27 From e20bb96169a6cf6613eda828859a51076b4d8a9a Mon Sep 17 00:00:00 2001 From: Christiano Anderson Date: Mon, 12 May 2025 20:02:36 +0200 Subject: [PATCH 34/42] Rebuild 1.4.29 --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index 51fb5a2..6308714 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,7 +7,7 @@ Name: xapian-core Version: 1.4.29 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Mon May 12 2025 Christiano Anderson - 1.4.29-2 +- Rebuild 1.4.29 + * Thu May 01 2025 Christiano Anderson - 1.4.29-1 - Update to 1.4.29 From 00843604db9e946d5d21a7532294516b3344f587 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:37:07 +0000 Subject: [PATCH 35/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index 6308714..68504f1 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,7 +7,7 @@ Name: xapian-core Version: 1.4.29 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.4.29-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon May 12 2025 Christiano Anderson - 1.4.29-2 - Rebuild 1.4.29 From fd7056f2153121c924d597e6bb839e994e484e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= Date: Tue, 12 Aug 2025 10:15:48 +0200 Subject: [PATCH 36/42] Update of fmf plans --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 25 +++++++++++++++++++++++++ plans.fmf | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..8085288 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,25 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} + +#Rawhide +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} + +#gating rhel +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional} diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..2d30261 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,35 @@ +/tier1-internal: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/xapian-core.git + name: /plans/tier1/internal + +/tier1-public: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/xapian-core.git + name: /plans/tier1/public + +/tier2-tier3-internal: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/xapian-core.git + name: /plans/tier2-tier3/internal + +/tier2-tier3-public: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/xapian-core.git + name: /plans/tier2-tier3/public + +/others-internal: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/xapian-core.git + name: /plans/others/internal + +/others-public: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/xapian-core.git + name: /plans/others/public \ No newline at end of file From 55ecdf1f361e332caca9ca70c9bb28c5acc668c8 Mon Sep 17 00:00:00 2001 From: Christiano Anderson Date: Sat, 6 Dec 2025 07:37:17 +0100 Subject: [PATCH 37/42] Update to 1.4.30 --- sources | 2 +- xapian-core.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 51d575c..743b5a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.29.tar.xz) = fe368f0b9b840d73f1d550814a8954cf3e0ee1f89206db8b2b00b82ed8abe93b890193f9bf10b801125c87438497640fd10e742b2f616dd69cdcb694757ed38d +SHA512 (xapian-core-1.4.30.tar.xz) = 42d3f0b5998da363cd03ca38a974862a8d37b24a2177cd6eeaf6d2bf8f688a568f264243c3c694bd345283bbce476cf334c6444e568c215b276ad42e55862cca diff --git a/xapian-core.spec b/xapian-core.spec index 68504f1..41682cd 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -6,8 +6,8 @@ %endif Name: xapian-core -Version: 1.4.29 -Release: 3%{?dist} +Version: 1.4.30 +Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Sat Dec 06 2025 Christiano Anderson - 1.4.30-1 +- Update to 1.4.30 + * Fri Jul 25 2025 Fedora Release Engineering - 1.4.29-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From cfc7e62af6968b9f77233fd90c6d3a75f9b4afc5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:26:50 +0000 Subject: [PATCH 38/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index 41682cd..e469e52 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,7 +7,7 @@ Name: xapian-core Version: 1.4.30 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.4.30-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Sat Dec 06 2025 Christiano Anderson - 1.4.30-1 - Update to 1.4.30 From b93a512d448420639d1ccbf6429266ec54e100d1 Mon Sep 17 00:00:00 2001 From: Christiano Anderson Date: Tue, 24 Feb 2026 18:55:23 +0100 Subject: [PATCH 39/42] Update to 1.4.31 --- sources | 2 +- xapian-core.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 743b5a7..d059ab5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.30.tar.xz) = 42d3f0b5998da363cd03ca38a974862a8d37b24a2177cd6eeaf6d2bf8f688a568f264243c3c694bd345283bbce476cf334c6444e568c215b276ad42e55862cca +SHA512 (xapian-core-1.4.31.tar.xz) = 45428083c6342333b0e4158b079c08ed3ff95b92c2fdec959acbcc28c27a6ab8d49f184bac0ddf6f7d2e5d44ba1e057ade9ef52c2b14f234ffc9d940878a1a2f diff --git a/xapian-core.spec b/xapian-core.spec index e469e52..48b7f85 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -6,8 +6,8 @@ %endif Name: xapian-core -Version: 1.4.30 -Release: 2%{?dist} +Version: 1.4.31 +Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Tue Feb 24 2026 Christiano Anderson - 1.4.31-1 +- Update to 1.4.31 + * Sat Jan 17 2026 Fedora Release Engineering - 1.4.30-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From d38abdbba7fab0aa374a85adac2341b265804f5a Mon Sep 17 00:00:00 2001 From: Christiano Anderson Date: Tue, 7 Apr 2026 20:29:08 +0200 Subject: [PATCH 40/42] Update to 2.0.0 --- sources | 2 +- xapian-core.spec | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sources b/sources index d059ab5..31b51cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.31.tar.xz) = 45428083c6342333b0e4158b079c08ed3ff95b92c2fdec959acbcc28c27a6ab8d49f184bac0ddf6f7d2e5d44ba1e057ade9ef52c2b14f234ffc9d940878a1a2f +SHA512 (xapian-core-2.0.0.tar.xz) = b9205997ca05748b3dae1b669f428bc04c6a5bda41dcae1443869741e1bd6c245e0e433c8c4afef021299a699fc4e4ed6ae82aae8541db613aa570a003afea43 diff --git a/xapian-core.spec b/xapian-core.spec index 48b7f85..f682ead 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -6,7 +6,7 @@ %endif Name: xapian-core -Version: 1.4.31 +Version: 2.0.0 Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later @@ -77,14 +77,12 @@ make check %{?_smp_mflags} %files %doc AUTHORS NEWS README %{_bindir}/xapian* -%{_bindir}/quest %{_bindir}/copydatabase %{_bindir}/simpleindex %{_bindir}/simplesearch %{_bindir}/simpleexpand %{_datadir}/xapian-core/ %{_mandir}/man1/xapian* -%{_mandir}/man1/quest.1* %{_mandir}/man1/copydatabase.1* %files libs @@ -103,6 +101,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Tue Apr 07 2026 Christiano Anderson - 2.0.0-1 +- Update to 2.0.0 + * Tue Feb 24 2026 Christiano Anderson - 1.4.31-1 - Update to 1.4.31 From 779fdd08e2c23bb631f00910fb31f2399d129871 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Fri, 10 Jul 2026 16:24:11 +0200 Subject: [PATCH 41/42] Revert "Update to 2.0.0" This reverts commit d38abdbba7fab0aa374a85adac2341b265804f5a. See https://forge.fedoraproject.org/releng/tickets/issues/13304 --- sources | 2 +- xapian-core.spec | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 31b51cd..d059ab5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-2.0.0.tar.xz) = b9205997ca05748b3dae1b669f428bc04c6a5bda41dcae1443869741e1bd6c245e0e433c8c4afef021299a699fc4e4ed6ae82aae8541db613aa570a003afea43 +SHA512 (xapian-core-1.4.31.tar.xz) = 45428083c6342333b0e4158b079c08ed3ff95b92c2fdec959acbcc28c27a6ab8d49f184bac0ddf6f7d2e5d44ba1e057ade9ef52c2b14f234ffc9d940878a1a2f diff --git a/xapian-core.spec b/xapian-core.spec index f682ead..48b7f85 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -6,7 +6,7 @@ %endif Name: xapian-core -Version: 2.0.0 +Version: 1.4.31 Release: 1%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later @@ -77,12 +77,14 @@ make check %{?_smp_mflags} %files %doc AUTHORS NEWS README %{_bindir}/xapian* +%{_bindir}/quest %{_bindir}/copydatabase %{_bindir}/simpleindex %{_bindir}/simplesearch %{_bindir}/simpleexpand %{_datadir}/xapian-core/ %{_mandir}/man1/xapian* +%{_mandir}/man1/quest.1* %{_mandir}/man1/copydatabase.1* %files libs @@ -101,9 +103,6 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog -* Tue Apr 07 2026 Christiano Anderson - 2.0.0-1 -- Update to 2.0.0 - * Tue Feb 24 2026 Christiano Anderson - 1.4.31-1 - Update to 1.4.31 From 6502332669cb3e864436dd280b4785c8bdb0e974 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:00:15 +0000 Subject: [PATCH 42/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xapian-core.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xapian-core.spec b/xapian-core.spec index 48b7f85..76d3ac3 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -7,7 +7,7 @@ Name: xapian-core Version: 1.4.31 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Xapian Probabilistic Information Retrieval Library License: GPL-2.0-or-later URL: https://www.xapian.org/ @@ -103,6 +103,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/xapian-config.1* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.4.31-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Tue Feb 24 2026 Christiano Anderson - 1.4.31-1 - Update to 1.4.31