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/.gitignore b/.gitignore index dab2046..95dcae6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xapian-core-*.tar.* +xapian-core-?.?.??/ 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 diff --git a/sources b/sources index a4214a8..d059ab5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xapian-core-1.4.10.tar.xz) = fa716d6f8c04edb297d99dad4d7835f7874837ab3c39d7017e43708cde6992c596e579418be17b79772e002bd23b94169812523a1abd9519b1dd3df474f027d9 +SHA512 (xapian-core-1.4.31.tar.xz) = 45428083c6342333b0e4158b079c08ed3ff95b92c2fdec959acbcc28c27a6ab8d49f184bac0ddf6f7d2e5d44ba1e057ade9ef52c2b14f234ffc9d940878a1a2f diff --git a/xapian-core.spec b/xapian-core.spec index 88a3017..76d3ac3 100644 --- a/xapian-core.spec +++ b/xapian-core.spec @@ -1,18 +1,25 @@ -Name: xapian-core -Version: 1.4.10 -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 - -BuildRequires: gcc gcc-c++ -BuildRequires: libuuid-devel -BuildRequires: zlib-devel +# Currently fails on s390x and ARMv7 %if ! 0%{?_module_build} -%ifarch %{valgrind_arches} -BuildRequires: valgrind-devel +%global with_tests 0 +%else +%global with_tests 0 %endif + +Name: xapian-core +Version: 1.4.31 +Release: 2%{?dist} +Summary: The Xapian Probabilistic Information Retrieval Library +License: GPL-2.0-or-later +URL: https://www.xapian.org/ +Source0: https://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.xz + +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libuuid-devel +BuildRequires: make +BuildRequires: zlib-devel +%if 0%{?with_tests} +BuildRequires: valgrind-devel %endif Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -44,24 +51,15 @@ indexing and search facilities to applications. This package provides the files needed for building packages which use Xapian %prep -%setup -q +%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 +%configure -# 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 - -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 @@ -69,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 @@ -80,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* @@ -98,10 +100,115 @@ 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 +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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