null+****@clear*****
null+****@clear*****
2012年 2月 1日 (水) 17:50:15 JST
Kouhei Sutou 2012-02-01 17:50:15 +0900 (Wed, 01 Feb 2012)
New Revision: a82853e17606e466ddc8b92143284281d4ab33ff
Log:
[rpm][fedora] use systemd.
Patch by Daiki Ueno. Thanks!!!
Modified files:
packages/rpm/fedora/groonga.spec.in
Modified: packages/rpm/fedora/groonga.spec.in (+23 -18)
===================================================================
--- packages/rpm/fedora/groonga.spec.in 2012-02-01 17:36:52 +0900 (ff9c9b3)
+++ packages/rpm/fedora/groonga.spec.in 2012-02-01 17:50:15 +0900 (6340f58)
@@ -22,7 +22,10 @@ BuildRequires: ruby
Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-plugin-suggest = %{version}-%{release}
Requires: %{name}-tokenizer-mecab = %{version}-%{release}
-Obsoletes: %{name} < 1.2.2-0
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+ExclusiveArch: %{ix86} x86_64
%description
Groonga is an embeddable full-text search engine library. It can
@@ -52,7 +55,6 @@ Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
Requires(postun): /sbin/service
-Obsoletes: %{name} < 1.2.2-0
%description server
This package contains the groonga server
@@ -138,7 +140,7 @@ PHP language binding for groonga
%build
%configure \
--disable-static \
- --with-package-platform=redhat \
+ --with-package-platform=fedora \
--with-munin-plugins
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -174,15 +176,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
mv $RPM_BUILD_ROOT%{_datadir}/doc/groonga groonga-doc
-mkdir -p $RPM_BUILD_ROOT%{_initddir}
-mv $RPM_BUILD_ROOT%{_sysconfdir}/groonga/init.d/redhat/groonga \
- $RPM_BUILD_ROOT%{_initddir}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-mv $RPM_BUILD_ROOT%{_sysconfdir}/groonga/init.d/redhat/sysconfig \
- $RPM_BUILD_ROOT%{_sysconfdir}/
-
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/groonga/init.d/
-
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/groonga
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/groonga/db
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/groonga
@@ -218,7 +211,9 @@ getent passwd groonga >/dev/null || \
exit 0
%post server
-/sbin/chkconfig --add groonga
+if [ $1 = 0 ] ; then
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
%post libs -p /sbin/ldconfig
@@ -230,15 +225,22 @@ exit 0
%preun server
if [ $1 = 0 ] ; then
- /sbin/service groonga stop >/dev/null 2>&1 || :
- /sbin/chkconfig --del groonga
+ /bin/systemctl --no-reload disable groonga.service > /dev/null 2>&1 || :
+ /bin/systemctl stop groonga.service > /dev/null 2>&1 || :
fi
%postun server
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
- /sbin/service groonga condrestart >/dev/null 2>&1 || :
+ /bin/systemctl try-restart groonga.service >/dev/null 2>&1 || :
fi
+%triggerun -- groonga < 1.3.0-1
+/usr/bin/systemd-sysv-convert --save groonga >/dev/null 2>&1 ||:
+/bin/systemctl --no-reload enable groonga.service >/dev/null 2>&1 ||:
+/sbin/chkconfig --del groonga >/dev/null 2>&1 || :
+/bin/systemctl try-restart groonga.service >/dev/null 2>&1 || :
+
%postun libs -p /sbin/ldconfig
%postun munin-plugins
@@ -263,14 +265,13 @@ fi
%dir %{_libdir}/groonga
%dir %{_libdir}/groonga/plugins
%dir %{_libdir}/groonga/plugins/tokenizers
-%dir %{_datadir}/groonga
%{_datadir}/groonga/
%files server
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/groonga/
%config(noreplace) %{_sysconfdir}/sysconfig/groonga
-%{_initddir}/*
+%dir %{_unitdir}/groonga.service
%ghost %dir %{_localstatedir}/run/%{name}
%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
@@ -317,6 +318,10 @@ fi
* Wed Feb 29 2012 Kouhei Sutou <kou****@clear*****> - 1.3.1-0
- new upstream release.
+* Mon Jan 30 2012 Daiki Ueno <dueno****@redha*****> - 1.3.0-1
+- built in Fedora
+- migrate groonga-server initscript to systemd service (#781503)
+
* Sun Jan 29 2012 Kouhei Sutou <kou****@clear*****> - 1.3.0-0
- new upstream release.
- groonga-server package does not require groonga-munin-plugins package.