packages: sphinx/sphinx.spec - add sphinx /var dirs

[glen]

Author: glen                         Date: Mon Apr 12 11:42:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add sphinx /var dirs

---- Files affected:
packages/sphinx:
   sphinx.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: packages/sphinx/sphinx.spec
diff -u packages/sphinx/sphinx.spec:1.24 packages/sphinx/sphinx.spec:1.25
--- packages/sphinx/sphinx.spec:1.24	Mon Apr 12 13:28:30 2010
+++ packages/sphinx/sphinx.spec	Mon Apr 12 13:42:39 2010
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO:
 #  - package for ruby API
-#  - run daemon under sphinx user
 #
 # Conditional build:
 %bcond_without	java		# without Java support
@@ -21,7 +20,7 @@
 Summary(pl.UTF-8):	Silnik przeszukiwania pełnotekstowego SQL open-source
 Name:		sphinx
 Version:	0.9.9
-Release:	1.3
+Release:	1.5
 License:	GPL v2
 Group:		Applications/Databases
 Source0:	http://www.sphinxsearch.com/downloads/%{name}-%{version}.tar.gz
@@ -147,6 +146,13 @@
 %patch0 -p1
 %patch1 -p1
 
+sed -i -e '
+	s#/var/run/#/var/run/sphinx/#
+	s#@CONFDIR@/log/searchd.pid#/var/run/sphinx/searchd.pid#
+	s#@CONFDIR@/log/#/var/log/sphinx/#g
+	s#@CONFDIR@/data/#/var/lib/sphinx/#g
+' sphinx*.conf.in
+
 %build
 %{__aclocal}
 %{__autoconf}
@@ -182,7 +188,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},/etc/rc.d/init.d,%{_localstatedir}/{log,run,lib}/%{name}}
+install -d $RPM_BUILD_ROOT{%{_sbindir},/etc/rc.d/init.d,/var/{log,run,lib}/%{name}}
 
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -228,7 +234,7 @@
 
 %pre
 %groupadd -g 249 sphinx
-%useradd -u 249 -d %{_localstatedir}/lib/%{name} -g sphinx -c "Sphinx Search" sphinx
+%useradd -u 249 -d /var/lib/%{name} -g sphinx -c "Sphinx Search" sphinx
 
 %post
 /sbin/chkconfig --add sphinx
@@ -252,6 +258,10 @@
 %attr(755,root,root) %{_bindir}/spelldump
 %attr(755,root,root) %{_sbindir}/searchd
 
+%dir %attr(771,root,sphinx) /var/run/sphinx
+%dir %attr(770,root,sphinx) /var/log/sphinx
+%dir %attr(770,root,sphinx) /var/lib/sphinx
+
 %files -n libsphinxclient
 %defattr(644,root,root,755)
 %doc api/libsphinxclient/README
@@ -288,6 +298,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2010/04/12 11:42:39  glen
+- add sphinx /var dirs
+
 Revision 1.24  2010/04/12 11:28:30  glen
 - package clean config
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sphinx/sphinx.spec?r1=1.24&r2=1.25&f=u