diff --git a/sphinx.spec b/sphinx.spec index c9dd0d7..3754790 100644 --- a/sphinx.spec +++ b/sphinx.spec @@ -20,10 +20,9 @@ Name: sphinx Version: 2.2.11 -Release: 34%{?dist} +Release: 29%{?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 +License: GPLv2+ URL: http://sphinxsearch.com Source0: http://sphinxsearch.com/files/%{name}-%{version}-release.tar.gz @@ -45,6 +44,7 @@ Requires(preun): systemd Requires(postun): systemd # Users and groups +Requires(pre): shadow-utils %description @@ -116,10 +116,10 @@ designed with indexing database content in mind. %prep %setup -qn %{name}-%{version}-release -%patch -P0 -p1 -b .fix_static -%patch -P1 -p1 -b .default_listen -%patch -P2 -p1 -%patch -P3 -p1 +%patch0 -p1 -b .fix_static +%patch1 -p1 -b .default_listen +%patch2 -p1 +%patch3 -p1 # Fix wrong-file-end-of-line-encoding for f in \ @@ -134,12 +134,6 @@ 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 @@ -283,7 +281,6 @@ 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 @@ -304,21 +301,6 @@ 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 - -* 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 - -* 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