HAYASHI Kentaro
null+****@clear*****
Mon Sep 24 17:28:48 JST 2012
HAYASHI Kentaro 2012-09-24 17:28:48 +0900 (Mon, 24 Sep 2012) New Revision: 20d79d5cee73e9c896b4156a6d4bf8d05b3ceddb https://github.com/groonga/groonga/commit/20d79d5cee73e9c896b4156a6d4bf8d05b3ceddb Log: rpm: split groonga-server package groonga-server-> groonga-server-http (port 10041) groonga-server-gqtp (port 10043) Modified files: packages/rpm/centos/groonga.spec.in packages/rpm/fedora/groonga.spec.in Modified: packages/rpm/centos/groonga.spec.in (+37 -11) =================================================================== --- packages/rpm/centos/groonga.spec.in 2012-09-24 16:54:45 +0900 (095dc3f) +++ packages/rpm/centos/groonga.spec.in 2012-09-24 17:28:48 +0900 (4389253) @@ -211,8 +211,11 @@ if [ $1 = 1 ]; then fi exit 0 -%post server -/sbin/chkconfig --add groonga +%post server-gqtp +/sbin/chkconfig --add groonga-server-gqtp + +%post server-http +/sbin/chkconfig --add groonga-server-http %post httpd if [ $1 = 1 ] ; then @@ -230,15 +233,26 @@ fi /sbin/service munin-node restart > /dev/null 2>&1 : -%preun server +%preun server-http +if [ $1 = 0 ] ; then + /sbin/service groonga-server-http stop >/dev/null 2>&1 || : + /sbin/chkconfig --del groonga-server-http +fi + +%postun server-http +if [ $1 -ge 1 ] ; then + /sbin/service groonga-server-http condrestart >/dev/null 2>&1 || : +fi + +%preun server-gqtp if [ $1 = 0 ] ; then - /sbin/service groonga stop >/dev/null 2>&1 || : - /sbin/chkconfig --del groonga + /sbin/service groonga-server-http stop >/dev/null 2>&1 || : + /sbin/chkconfig --del groonga-server-gqtp fi -%postun server +%postun server-gqtp if [ $1 -ge 1 ] ; then - /sbin/service groonga condrestart >/dev/null 2>&1 || : + /sbin/service groonga-server-gqtp condrestart >/dev/null 2>&1 || : fi %postun libs -p /sbin/ldconfig @@ -270,12 +284,22 @@ fi %files server-common -%files server +%files server-gqtp +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/groonga/ +%config(noreplace) %{_sysconfdir}/sysconfig/groonga-server-gqtp +%config(noreplace) %{_sysconfdir}/logrotate.d/groonga-server-gqtp +%{_initddir}/groonga-server-gqtp +%ghost %dir %{_localstatedir}/run/%{name} +%attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name} +%attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db + +%files server-http %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/groonga/ -%config(noreplace) %{_sysconfdir}/sysconfig/groonga -%config(noreplace) %{_sysconfdir}/logrotate.d/groonga-server -%{_initddir}/groonga +%config(noreplace) %{_sysconfdir}/sysconfig/groonga-server-http +%config(noreplace) %{_sysconfdir}/logrotate.d/groonga-server-http +%{_initddir}/groonga-server-http %ghost %dir %{_localstatedir}/run/%{name} %attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name} %attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db @@ -318,6 +342,8 @@ fi %changelog * Sat Sep 29 2012 HAYASHI Kentaro <hayashi �� clear-code.com> - 2.0.7-0 - new upstream release. +- Split groonga-server package into groonga-server-gqtp and + groonga-server-http package. * Wed Aug 29 2012 HAYASHI Kentaro <hayashi �� clear-code.com> - 2.0.6-0 - new upstream release. Modified: packages/rpm/fedora/groonga.spec.in (+20 -6) =================================================================== --- packages/rpm/fedora/groonga.spec.in 2012-09-24 16:54:45 +0900 (34513fa) +++ packages/rpm/fedora/groonga.spec.in 2012-09-24 17:28:48 +0900 (a903de3) @@ -250,7 +250,10 @@ if [ $1 = 1 ] ; then fi exit 0 -%post server +%post server-http +/bin/systemctl daemon-reload >/dev/null 2>&1 || : + +%post server-gqtp /bin/systemctl daemon-reload >/dev/null 2>&1 || : %post httpd @@ -270,13 +273,13 @@ fi /sbin/service munin-node restart > /dev/null 2>&1 : -%preun server +%preun server-http if [ $1 = 0 ] ; then /bin/systemctl --no-reload disable groonga.service > /dev/null 2>&1 || : /bin/systemctl stop groonga.service > /dev/null 2>&1 || : fi -%postun server +%postun server-http /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then /bin/systemctl try-restart groonga.service >/dev/null 2>&1 || : @@ -329,11 +332,20 @@ fi %files server-common -%files server +%files server-http +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/groonga/ +%config(noreplace) %{_sysconfdir}/sysconfig/groonga-server-http +%dir %{_unitdir}/groonga-server-http.service +%ghost %dir %{_localstatedir}/run/%{name} +%attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name} +%attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db + +%files server-gqtp %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/groonga/ -%config(noreplace) %{_sysconfdir}/sysconfig/groonga -%dir %{_unitdir}/groonga.service +%config(noreplace) %{_sysconfdir}/sysconfig/groonga-server-gqtp +%dir %{_unitdir}/groonga-server-gqtp.service %ghost %dir %{_localstatedir}/run/%{name} %attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name} %attr(0750,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db @@ -382,6 +394,8 @@ fi %changelog * Sat Sep 29 2012 HAYASHI Kentaro <hayashi �� clear-code.com> - 2.0.7-0 - new upstream release. +- Split groonga-server package into groonga-server-gqtp and + groonga-server-http package. * Wed Aug 29 2012 HAYASHI Kentaro <hayashi �� clear-code.com> - 2.0.6-0 - new upstream release. -------------- next part -------------- HTML����������������������������...Download
