null+****@clear*****
null+****@clear*****
2011年 5月 1日 (日) 16:56:31 JST
Kouhei Sutou 2011-05-01 07:56:31 +0000 (Sun, 01 May 2011)
New Revision: ae4a6ea163d5b12e7ea9b244e65111b9d73d30a6
Log:
[rpm] split server files into groonga-server package.
Modified files:
rpm/centos/groonga.spec.in
rpm/fedora/groonga.spec.in
Modified: rpm/centos/groonga.spec.in (+38 -16)
===================================================================
--- rpm/centos/groonga.spec.in 2011-05-01 07:28:10 +0000 (926ee6f)
+++ rpm/centos/groonga.spec.in 2011-05-01 07:56:31 +0000 (1eb3f14)
@@ -12,15 +12,14 @@ Source0: http://groonga.org/files/groonga/groonga-@VERSION@.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
BuildRequires: mecab-devel
+Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-plugin-suggest = %{version}-%{release}
+Requires: %{name}-tokenizer-mecab = %{version}-%{release}
+Requires: %{name}-doc = %{version}-%{release}
#BuildRequires: messagepack-devel
#BuildRequires: zeromq-devel
#BuildRequires: libevent-devel
-Requires: %{name}-libs = %{version}-%{release}
-Requires(pre): shadow-utils
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
+Obsoletes: %{name} < 1.2.2-0
%description
Groonga is an embeddable full-text search engine library. It can
@@ -38,6 +37,22 @@ Requires(postun): /sbin/ldconfig
%description libs
This package contains the libraries for groonga
+%package server
+Summary: Groonga server
+Group: Applications/Text
+License: LGPLv2 and (MIT or GPLv2)
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-munin-plugins = %{version}-%{release}
+Requires(pre): shadow-utils
+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
+
%package doc
Summary: Documentation for groonga
Group: Documentation
@@ -137,14 +152,14 @@ EOC
%clean
rm -rf $RPM_BUILD_ROOT
-%pre
+%pre server
getent group groonga >/dev/null || groupadd -r groonga
getent passwd groonga >/dev/null || \
useradd -r -g groonga -d %{_localstatedir}/lib/groonga -s /sbin/nologin \
-c 'groonga' groonga
exit 0
-%post
+%post server
/sbin/chkconfig --add groonga
%post libs -p /sbin/ldconfig
@@ -155,13 +170,13 @@ exit 0
/sbin/service munin-node restart > /dev/null 2>&1
:
-%preun
+%preun server
if [ $1 = 0 ] ; then
/sbin/service groonga stop >/dev/null 2>&1 || :
/sbin/chkconfig --del groonga
fi
-%postun
+%postun server
if [ $1 -ge 1 ] ; then
/sbin/service groonga condrestart >/dev/null 2>&1 || :
fi
@@ -179,14 +194,8 @@ fi
%files
%defattr(-,root,root,-)
%{_datadir}/man/man1/*
-%config(noreplace) %{_sysconfdir}/groonga/
-%config(noreplace) %{_sysconfdir}/sysconfig/groonga
%{_bindir}/groonga
%{_bindir}/grntest
-%{_initddir}/*
-%ghost %dir %{_localstatedir}/run/%{name}
-%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
-%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
%files libs
%defattr(-,root,root,-)
@@ -198,6 +207,15 @@ fi
%dir %{_datadir}/groonga
%{_datadir}/groonga/
+%files server
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/groonga/
+%config(noreplace) %{_sysconfdir}/sysconfig/groonga
+%{_initddir}/*
+%ghost %dir %{_localstatedir}/run/%{name}
+%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
+%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
+
%files doc
%defattr(-,root,root,-)
%doc %{_datadir}/groonga/doc/
@@ -224,6 +242,10 @@ fi
%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/*
%changelog
+* Sun May 29 2011 Kouhei Sutou <kou****@clear*****> - 1.2.2-0
+- new upstream release.
+- split server files into groonga-server package.
+
* Fri Apr 29 2011 Kouhei Sutou <kou****@clear*****> - 1.2.1-0
- new upstream release.
Modified: rpm/fedora/groonga.spec.in (+37 -15)
===================================================================
--- rpm/fedora/groonga.spec.in 2011-05-01 07:28:10 +0000 (ea4fd3b)
+++ rpm/fedora/groonga.spec.in 2011-05-01 07:56:31 +0000 (e629aa8)
@@ -17,11 +17,10 @@ BuildRequires: mecab-devel
BuildRequires: python2-devel
BuildRequires: php-devel
Requires: %{name}-libs = %{version}-%{release}
-Requires(pre): shadow-utils
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
+Requires: %{name}-plugin-suggest = %{version}-%{release}
+Requires: %{name}-tokenizer-mecab = %{version}-%{release}
+Requires: %{name}-doc = %{version}-%{release}
+Obsoletes: %{name} < 1.2.2-0
%description
Groonga is an embeddable full-text search engine library. It can
@@ -39,6 +38,22 @@ Requires(postun): /sbin/ldconfig
%description libs
This package contains the libraries for groonga
+%package server
+Summary: Groonga server
+Group: Applications/Text
+License: LGPLv2 and (MIT or GPLv2)
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-munin-plugins = %{version}-%{release}
+Requires(pre): shadow-utils
+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
+
%package doc
Summary: Documentation for groonga
Group: Documentation
@@ -182,14 +197,14 @@ cd %{_builddir}/%{name}-%{version}/bindings/php
make install INSTALL_ROOT=$RPM_BUILD_ROOT INSTALL="install -p"
-%pre
+%pre server
getent group groonga >/dev/null || groupadd -r groonga
getent passwd groonga >/dev/null || \
useradd -r -g groonga -d %{_localstatedir}/lib/groonga -s /sbin/nologin \
-c 'groonga' groonga
exit 0
-%post
+%post server
/sbin/chkconfig --add groonga
%post libs -p /sbin/ldconfig
@@ -200,13 +215,13 @@ exit 0
/sbin/service munin-node restart > /dev/null 2>&1
:
-%preun
+%preun server
if [ $1 = 0 ] ; then
/sbin/service groonga stop >/dev/null 2>&1 || :
/sbin/chkconfig --del groonga
fi
-%postun
+%postun server
if [ $1 -ge 1 ] ; then
/sbin/service groonga condrestart >/dev/null 2>&1 || :
fi
@@ -224,14 +239,8 @@ fi
%files
%defattr(-,root,root,-)
%{_datadir}/man/man1/*
-%config(noreplace) %{_sysconfdir}/groonga/
-%config(noreplace) %{_sysconfdir}/sysconfig/groonga
%{_bindir}/groonga
%{_bindir}/grntest
-%{_initddir}/*
-%ghost %dir %{_localstatedir}/run/%{name}
-%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
-%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
%files libs
%defattr(-,root,root,-)
@@ -243,6 +252,15 @@ fi
%dir %{_datadir}/groonga
%{_datadir}/groonga/
+%files server
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/groonga/
+%config(noreplace) %{_sysconfdir}/sysconfig/groonga
+%{_initddir}/*
+%ghost %dir %{_localstatedir}/run/%{name}
+%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
+%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
+
%files doc
%defattr(-,root,root,-)
%doc %{_datadir}/groonga/doc/
@@ -277,6 +295,10 @@ fi
%{php_extdir}/groonga.so
%changelog
+* Sun May 29 2011 Kouhei Sutou <kou****@clear*****> - 1.2.2-0
+- new upstream release.
+- split server files into groonga-server package.
+
* Fri Apr 29 2011 Kouhei Sutou <kou****@clear*****> - 1.2.1-0
- new upstream release.