From 0654578e36ffb215d341c880790757828aee1d48 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 1/6] Eliminate use of obsolete %patchN syntax (#2283636) --- sphinx.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 3754790..ba55423 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -116,10 +116,10 @@ designed with indexing database content in mind. %prep %setup -qn %{name}-%{version}-release -%patch0 -p1 -b .fix_static -%patch1 -p1 -b .default_listen -%patch2 -p1 -%patch3 -p1 +%patch -P0 -p1 -b .fix_static +%patch -P1 -p1 -b .default_listen +%patch -P2 -p1 +%patch -P3 -p1 # Fix wrong-file-end-of-line-encoding for f in \ From 25ee1da2c039422bd7f76218915e010079494d97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 06:12:59 +0000 Subject: [PATCH 2/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index ba55423..65d7135 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,7 +20,7 @@ Name: sphinx Version: 2.2.11 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Free open-source SQL full-text search engine License: GPLv2+ URL: http://sphinxsearch.com @@ -301,6 +301,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.2.11-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.2.11-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1e50bc0ef72b73da47c24b181164271190151580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:02:43 +0200 Subject: [PATCH 3/6] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- sphinx.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 65d7135..718e7e7 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,9 +20,10 @@ Name: sphinx Version: 2.2.11 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Free open-source SQL full-text search engine -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://sphinxsearch.com Source0: http://sphinxsearch.com/files/%{name}-%{version}-release.tar.gz @@ -301,6 +302,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Fri Jul 26 2024 Miroslav Suchý - 2.2.11-31 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 2.2.11-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4642831466e81c6ddd8d40621e0bea8f2559a95e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 11:24:04 +0000 Subject: [PATCH 4/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 718e7e7..07fbfbe 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,7 +20,7 @@ Name: sphinx Version: 2.2.11 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Free open-source SQL full-text search engine # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -302,6 +302,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.2.11-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 2.2.11-31 - convert license to SPDX From 7e51c472a91044fff4dda56332ab84c54114923e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 16:44:37 +0100 Subject: [PATCH 5/6] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- sphinx.spec | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/sphinx.spec b/sphinx.spec index 07fbfbe..6a34222 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,7 +20,7 @@ Name: sphinx Version: 2.2.11 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Free open-source SQL full-text search engine # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -45,7 +45,6 @@ Requires(preun): systemd Requires(postun): systemd # Users and groups -Requires(pre): shadow-utils %description @@ -135,6 +134,12 @@ done # Fix file not UTF8 iconv -f iso8859-1 -t utf-8 doc/%{name}.txt > doc/%{name}.txt.conv && mv -f doc/%{name}.txt.conv doc/%{name}.txt +# Create a sysusers.d config file +cat >sphinx.sysusers.conf </dev/null || groupadd -r %{sphinx_group} -getent passwd %{sphinx_user} >/dev/null || \ -useradd -r -g %{sphinx_group} -d %{sphinx_home} -s /bin/bash \ --c "Sphinx Search" %{sphinx_user} -exit 0 %post %systemd_post searchd.service @@ -282,6 +283,7 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/run/%{name} %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/lib/%{name} %{_mandir}/man1/* +%{_sysusersdir}/sphinx.conf %files -n libsphinxclient %doc COPYING %{?with_java: api/java} api/ruby api/*.php api/*.py api/libsphinxclient/README @@ -302,6 +304,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.2.11-33 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sun Jan 19 2025 Fedora Release Engineering - 2.2.11-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 111968c2e9ba497bec3cd57d76ca9779848e5cd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:37:34 +0000 Subject: [PATCH 6/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx.spec b/sphinx.spec index 6a34222..c9dd0d7 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,7 +20,7 @@ Name: sphinx Version: 2.2.11 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Free open-source SQL full-text search engine # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -304,6 +304,9 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/ %{_datadir}/php/* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.2.11-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.2.11-33 - Add sysusers.d config file to allow rpm to create users/groups automatically