[groonga] Use /run/groonga to fix E:dir-or-file-in-var-run error.
kenhys
kenhys at fedoraproject.org
Tue Jan 6 08:37:22 UTC 2015
commit 5639f671ec52893cd934b3081c8e8e670e3382e2
Author: HAYASHI Kentaro <hayashi at clear-code.com>
Date: Tue Jan 6 16:59:30 2015 +0900
Use /run/groonga to fix E:dir-or-file-in-var-run error.
groonga.spec | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/groonga.spec b/groonga.spec
index ffe2528..f76fc2f 100644
--- a/groonga.spec
+++ b/groonga.spec
@@ -228,7 +228,7 @@ install -p -m 644 data/systemd/fedora/groonga-server-http.service $RPM_BUILD_ROO
rm -f $RPM_BUILD_ROOT/lib/systemd/system/groonga-httpd.service
install -p -m 644 data/systemd/fedora/groonga-httpd.service $RPM_BUILD_ROOT%{_unitdir}
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/groonga
+mkdir -p $RPM_BUILD_ROOT/run/groonga
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/groonga/db
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/groonga
mkdir -p $RPM_BUILD_ROOT%{_libdir}/groonga/plugins/normalizers
@@ -246,19 +246,19 @@ cat <<EOC > $RPM_BUILD_ROOT%{_sysconfdir}/munin/plugin-conf.d/groonga
env.http_host 127.0.0.1
env.http_port 10041
env.http_database_path %{_localstatedir}/lib/groonga/db/db
- env.http_pid_path %{_localstatedir}/run/groonga/groonga-http.pid
+ env.http_pid_path /run/groonga/groonga-http.pid
env.http_query_log_path %{_localstatedir}/log/groonga/query-http.log
env.httpd_host 127.0.0.1
env.httpd_port 10041
env.httpd_database_path %{_localstatedir}/lib/groonga/db/db
- env.httpd_pid_path %{_localstatedir}/run/groonga/groonga-httpd.pid
+ env.httpd_pid_path /run/groonga/groonga-httpd.pid
env.httpd_query_log_path %{_localstatedir}/log/groonga/httpd/groonga-query.log
env.gqtp_host 127.0.0.1
env.gqtp_port 10043
env.gqtp_database_path %{_localstatedir}/lib/groonga/db/db
- env.gqtp_pid_path %{_localstatedir}/run/groonga/groonga-gqtp.pid
+ env.gqtp_pid_path /run/groonga/groonga-gqtp.pid
env.gqtp_query_log_path %{_localstatedir}/log/groonga/query-gqtp.log
EOC
@@ -288,8 +288,8 @@ if [ $1 = 1 ] ; then
mkdir -p %{_localstatedir}/lib/groonga/db
groonga -n %{_localstatedir}/lib/groonga/db/db shutdown > /dev/null
chown -R groonga:groonga %{_localstatedir}/lib/groonga
- mkdir -p %{_localstatedir}/run/groonga
- chown -R groonga:groonga %{_localstatedir}/run/groonga
+ mkdir -p /run/groonga
+ chown -R groonga:groonga /run/groonga
fi
exit 0
@@ -367,7 +367,7 @@ fi
%config(noreplace) %{_sysconfdir}/groonga/
%config(noreplace) %{_sysconfdir}/sysconfig/groonga-server-http
%{_unitdir}/groonga-server-http.service
-%ghost %dir %{_localstatedir}/run/%{name}
+%ghost %dir /run/%{name}
%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
@@ -376,7 +376,7 @@ fi
%config(noreplace) %{_sysconfdir}/groonga/
%config(noreplace) %{_sysconfdir}/sysconfig/groonga-server-gqtp
%{_unitdir}/groonga-server-gqtp.service
-%ghost %dir %{_localstatedir}/run/%{name}
+%ghost %dir /run/%{name}
%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
@@ -386,7 +386,7 @@ fi
%{_unitdir}/groonga-httpd.service
%{_sbindir}/groonga-httpd
%{_sbindir}/groonga-httpd-restart
-%ghost %dir %{_localstatedir}/run/%{name}
+%ghost %dir /run/%{name}
%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
@@ -430,6 +430,8 @@ fi
%changelog
* Tue Jan 6 2015 HAYASHI Kentaro <hayashi at clear-code.com> - 4.0.9.1-1
- new upstream release.
+- remove needless 'g' option to remove rpath.
+- use /run/groonga to fix dir-or-file-in-var-run error.
* Mon Dec 1 2014 HAYASHI Kentaro <hayashi at clear-code.com> - 4.0.8-1
- new upstream release.
More information about the scm-commits
mailing list