Author: glen Date: Tue Mar 30 22:24:34 2010 GMT Module: packages Tag: HEAD ---- Log message: - add sphinx user, add build fix patch
---- Files affected: packages/sphinx: sphinx.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: packages/sphinx/sphinx.spec diff -u packages/sphinx/sphinx.spec:1.22 packages/sphinx/sphinx.spec:1.23 --- packages/sphinx/sphinx.spec:1.22 Tue Mar 30 23:04:05 2010 +++ packages/sphinx/sphinx.spec Wed Mar 31 00:24:28 2010 @@ -1,7 +1,7 @@ # $Revision$, $Date$ -# # TODO: # - package for ruby API +# - run daemon under sphinx user # # Conditional build: %bcond_without java # without Java support @@ -21,13 +21,14 @@ Summary(pl.UTF-8): Silnik przeszukiwania pełnotekstowego SQL open-source Name: sphinx Version: 0.9.9 -Release: 1 +Release: 0.1 License: GPL v2 Group: Applications/Databases Source0: http://www.sphinxsearch.com/downloads/%{name}-%{version}.tar.gz # Source0-md5: 7b9b618cb9b378f949bb1b91ddcc4f54 Source1: %{name}.init Patch0: %{name}-system-libstemmer.patch +Patch1: bug-468.patch URL: http://www.sphinxsearch.com/ BuildRequires: autoconf BuildRequires: automake @@ -40,6 +41,14 @@ BuildRequires: rpm-javaprov BuildRequires: rpm-php-pearprov >= 4.4.2-11 BuildRequires: rpmbuild(macros) >= 1.461 +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel +Requires(pre): /bin/id +Requires(pre): /usr/bin/getgid +Requires(pre): /usr/sbin/groupadd +Requires(pre): /usr/sbin/useradd +Provides: group(sphinx) +Provides: user(sphinx) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -134,6 +143,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__aclocal} @@ -174,6 +184,7 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/example.sql mv $RPM_BUILD_ROOT%{_sysconfdir}/sphinx.conf{.dist,} +rm $RPM_BUILD_ROOT%{_sysconfdir}/sphinx-min.conf.dist mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/searchd install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} @@ -206,11 +217,24 @@ %post -n libsphinxclient -p /sbin/ldconfig %postun -n libsphinxclient -p /sbin/ldconfig +%pre +%groupadd -g 249 sphinx +%useradd -u 249 -d %{_localstatedir}/lib/%{name} -g sphinx -c "Sphinx Search" sphinx + +%post +/sbin/chkconfig --add sphinx +%service sphinx restart + +%preun +if [ $1 = 0 ] ; then + %service sphinx stop + /sbin/chkconfig --del sphinx +fi + %files %defattr(644,root,root,755) %doc doc/sphinx.txt example.sql %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sphinx.conf -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sphinx-min.conf.dist %attr(755,root,root) %{_bindir}/indexer %attr(755,root,root) %{_bindir}/indextool %attr(755,root,root) %{_bindir}/search @@ -254,6 +278,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.23 2010/03/30 22:24:28 glen +- add sphinx user, add build fix patch + Revision 1.22 2010/03/30 21:04:05 glen - up to 0.9.9 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sphinx/sphinx.spec?r1=1.22&r2=1.23&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
