[sphinx] - upstream 2.0.7 - use tmpfiles.d to create pid directory - move default log file location to /var/l

[Christof Damian]

commit 18399f0fe65ff0c789a25e52e7eaa92f2b8a73ea
Author: Christof Damian <christof at damian.net>
Date:   Sat Apr 20 22:21:55 2013 +0200

    - upstream 2.0.7
    - use tmpfiles.d to create pid directory
    - move default log file location to /var/log/sphinx

 .gitignore  |    1 +
 sources     |    2 +-
 sphinx.spec |   47 ++++++++++++++++++++++++-----------------------
 3 files changed, 26 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6691bad..6f1a1e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /sphinx-2.0.6-release.tar.gz
+/sphinx-2.0.7-release.tar.gz
diff --git a/sources b/sources
index 86f0971..de9551d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de6be5ee20b1bfafa2a0cea7155a8331  sphinx-2.0.6-release.tar.gz
+3ac90957277bdd351c5f167751de9ec5  sphinx-2.0.7-release.tar.gz
diff --git a/sphinx.spec b/sphinx.spec
index 9f8635c..89b889d 100644
--- a/sphinx.spec
+++ b/sphinx.spec
@@ -3,7 +3,7 @@
 %global sphinx_home %{_localstatedir}/lib/sphinx
 
 Name:           sphinx
-Version:        2.0.6
+Version:        2.0.7
 Release:        1%{?dist}
 Summary:        Free open-source SQL full-text search engine
 
@@ -25,14 +25,10 @@ BuildRequires:  expat-devel
 BuildRequires:  dos2unix
 #Requires:
 
-#Initscripts
-#Requires(post): chkconfig
-#Requires(preun): chkconfig initscripts
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 
-
 # Users and groups
 Requires(pre): shadow-utils
        
@@ -141,17 +137,15 @@ make -C api/java
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c"
 
-# Install sphinx initscript
-#install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/searchd
 install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/searchd.service
 
 # Create /var/log/sphinx
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx
+touch $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx/searchd.log
+touch $RPM_BUILD_ROOT%{_localstatedir}/log/sphinx/query.log
 
 # Create /var/run/sphinx
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/sphinx
-touch $RPM_BUILD_ROOT%{_localstatedir}/run/sphinx/searchd.log
-touch $RPM_BUILD_ROOT%{_localstatedir}/run/sphinx/query.log
 
 # Create /var/lib/sphinx
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/sphinx
@@ -161,22 +155,22 @@ cp $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx-min.conf.dist \
     $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf
     
 # Modify sphinx.conf
-sed -i 's/\/var\/log\/searchd.log/\/var\/log\/sphinx\/searchd.log/g' \
-$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf
+sed -i 's|/var/log/searchd.log|%{_localstatedir}/log/sphinx/searchd.log|g' \
+    $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf
 
-sed -i 's/\/var\/log\/query.log/\/var\/log\/sphinx\/query.log/g' \
-$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf
+sed -i 's|/var/log/query.log|%{_localstatedir}/log/sphinx/query.log|g' \
+    $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf
 
-sed -i 's/\/var\/log\/searchd.pid/\/var\/run\/sphinx\/searchd.pid/g' \
-$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf
+sed -i 's|/var/log/searchd.pid|%{_localstatedir}/run/sphinx/searchd.pid|g' \
+    $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf
 
-sed -i 's/\/var\/data\/test1/\/var\/lib\/sphinx\/test1/g' \
-$RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf
+sed -i 's|/var/data|%{_localstatedir}/lib/sphinx|g' \
+    $RPM_BUILD_ROOT%{_sysconfdir}/sphinx/sphinx.conf
 
 # Create /etc/logrotate.d/sphinx
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sphinx << EOF
-/var/log/sphinx/*.log {
+%{_localstatedir}/log/sphinx/*.log {
        weekly
        rotate 10
        copytruncate
@@ -187,6 +181,12 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sphinx << EOF
 }
 EOF
 
+# Create /etc/logrotate.d/sphinx                                                                                         
+mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
+cat > $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf << EOF
+d %{_localstatedir}/run/sphinx 755 sphinx root -
+EOF
+
 # Install libsphinxclient
 pushd api/libsphinxclient/
     make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c"
@@ -280,19 +280,15 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/
 %config(noreplace) %{_sysconfdir}/sphinx/sphinx.conf
 %exclude %{_sysconfdir}/sphinx/*.conf.dist
 %exclude %{_sysconfdir}/sphinx/example.sql
-#%%{_initrddir}/searchd
 %{_unitdir}/searchd.service
 %config(noreplace) %{_sysconfdir}/logrotate.d/sphinx
+%{_tmpfilesdir}/%{name}.conf
 %{_bindir}/*
 %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/log/sphinx
 %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/run/sphinx
 %dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/lib/sphinx
 %{_mandir}/man1/*
 
-%ghost %{_localstatedir}/run/sphinx/searchd.log
-%ghost %{_localstatedir}/run/sphinx/query.log
-
-
 %files -n libsphinxclient
 %defattr(-,root,root,-)
 %doc COPYING api/java api/ruby api/*.php api/*.py api/libsphinxclient/README
@@ -316,6 +312,11 @@ chown -R %{sphinx_user}:root %{_localstatedir}/lib/sphinx/
 %{_datadir}/php/*
 
 %changelog
+* Sat Apr 20 2013 Christof Damian <christof at damian.net> - 2.0.7-1
+- upstream 2.0.7
+- use tmpfiles.d to create pid directory
+- move default log file location to /var/log/sphinx
+
 * Wed Mar  6 2013 Michel Salim <salimma at fedoraproject.org> - 2.0.6-1
 - Update to 2.0.6
 - Remove obsoleted patches