From 0c7c3440aceeb3b0c926ba41bd3f30f7209a53b9 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Feb 14 2019 21:29:16 +0000
Subject: Revert incorrect use of _tmpfiledir rhbx#1551735


This reverts commit 63ce93378acea60afe6e39b1a7f3b4b6739f536d.

Conflicts:
	sphinx.spec

---

diff --git a/sphinx.spec b/sphinx.spec
index 2c96188..0a1472d 100644
--- a/sphinx.spec
+++ b/sphinx.spec
@@ -1,6 +1,6 @@
 %global sphinx_user sphinx
 %global sphinx_group sphinx
-%global sphinx_home %{_tmpfilesdir}/lib/sphinx
+%global sphinx_home %{_localstatedir}/lib/sphinx
 
 # rpmbuild < 4.6 support
 %if ! 0%{?__isa_bits}
@@ -13,7 +13,7 @@
 
 Name:		sphinx
 Version:	2.2.11
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Free open-source SQL full-text search engine
 License:	GPLv2+
 URL:		http://sphinxsearch.com
@@ -146,35 +146,35 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p -c"
 install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/searchd.service
 
 # Create /var/log/sphinx
-mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/log/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
 
 # Create /var/run/sphinx
-mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/run/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
 
 # Create /var/lib/sphinx
-mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}/lib/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
 
 # Create sphinx.conf
 cp $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}-min.conf.dist \
     $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
     
 # Modify sphinx.conf
-sed -i 's|/var/log/searchd.log|%{_tmpfilesdir}/log/%{name}/searchd.log|g' \
+sed -i 's|/var/log/searchd.log|%{_localstatedir}/log/%{name}/searchd.log|g' \
     $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
 
-sed -i 's|/var/log/query.log|%{_tmpfilesdir}/log/%{name}/query.log|g' \
+sed -i 's|/var/log/query.log|%{_localstatedir}/log/%{name}/query.log|g' \
     $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
 
-sed -i 's|/var/log/searchd.pid|%{_tmpfilesdir}/run/%{name}/searchd.pid|g' \
+sed -i 's|/var/log/searchd.pid|%{_localstatedir}/run/%{name}/searchd.pid|g' \
     $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
 
-sed -i 's|/var/data|%{_tmpfilesdir}/lib/sphinx|g' \
+sed -i 's|/var/data|%{_localstatedir}/lib/sphinx|g' \
     $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
 
 # Create /etc/logrotate.d/sphinx
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} << EOF
-%{_tmpfilesdir}/log/%{name}/*.log {
+%{_localstatedir}/log/%{name}/*.log {
        weekly
        rotate 10
        copytruncate
@@ -234,9 +234,9 @@ exit 0
 %systemd_postun_with_restart searchd.service
 
 %posttrans
-chown -R %{sphinx_user}:root %{_tmpfilesdir}/log/%{name}/
-chown -R %{sphinx_user}:root %{_tmpfilesdir}/run/%{name}/
-chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/%{name}/
+chown -R %{sphinx_user}:root %{_localstatedir}/log/%{name}/
+chown -R %{sphinx_user}:root %{_localstatedir}/run/%{name}/
+chown -R %{sphinx_user}:root %{_localstatedir}/lib/%{name}/
 
 %triggerun -- sphinx < 2.0.3-1
 # Save the current service runlevel info
@@ -259,9 +259,9 @@ chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/%{name}/
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_tmpfilesdir}/%{name}.conf
 %{_bindir}/*
-%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/log/%{name}
-%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/run/%{name}
-%dir %attr(0755, %{sphinx_user}, root) %{_tmpfilesdir}/lib/%{name}
+%dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/log/%{name}
+%dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/run/%{name}
+%dir %attr(0755, %{sphinx_user}, root) %{_localstatedir}/lib/%{name}
 %{_mandir}/man1/*
 
 %files -n libsphinxclient
@@ -281,6 +281,9 @@ chown -R %{sphinx_user}:root %{_tmpfilesdir}/lib/%{name}/
 %{_datadir}/php/*
 
 %changelog
+* Thu Feb 14 2019 Orion Poplawski <orion@nwra.com> - 2.2.11-11
+- Revert incorrect use of _tmpfiledir rhbx#1551735
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.11-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild