null+****@clear*****
null+****@clear*****
2012年 8月 2日 (木) 16:47:49 JST
HAYASHI Kentaro 2012-08-02 16:47:49 +0900 (Thu, 02 Aug 2012) New Revision: 4d65facea542be840bc35394a8ed9617d885ee8d https://github.com/groonga/groonga/commit/4d65facea542be840bc35394a8ed9617d885ee8d Log: rpm: add groonga-server-common package Modified files: packages/rpm/centos/groonga.spec.in packages/rpm/fedora/groonga.spec.in Modified: packages/rpm/centos/groonga.spec.in (+13 -1) =================================================================== --- packages/rpm/centos/groonga.spec.in 2012-08-02 15:02:48 +0900 (3e0a2bd) +++ packages/rpm/centos/groonga.spec.in 2012-08-02 16:47:49 +0900 (9da07cd) @@ -45,6 +45,16 @@ Requires(postun): /sbin/ldconfig %description libs This package contains the libraries for groonga +%package server-common +Summary: Common packages for the groonga server and the groonga HTTP server +Group: Applications/Text +License: LGPLv2 +Requires: %{name} = %{version}-%{release} +Requires(pre): shadow-utils + +%description server-common +This package provides common settings for server use + %package server Summary: Groonga server Group: Applications/Text @@ -166,7 +176,7 @@ EOC %clean rm -rf $RPM_BUILD_ROOT -%pre server +%pre server-common getent group groonga >/dev/null || groupadd -r groonga getent passwd groonga >/dev/null || \ useradd -r -g groonga -d %{_localstatedir}/lib/groonga -s /sbin/nologin \ @@ -222,6 +232,8 @@ fi %{_libdir}/groonga/plugins/table/table.so %{_datadir}/groonga/ +%files server-common + %files server %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/groonga/ Modified: packages/rpm/fedora/groonga.spec.in (+13 -8) =================================================================== --- packages/rpm/fedora/groonga.spec.in 2012-08-02 15:02:48 +0900 (f3ee33d) +++ packages/rpm/fedora/groonga.spec.in 2012-08-02 16:47:49 +0900 (4ea9f00) @@ -44,6 +44,16 @@ Requires(postun): /sbin/ldconfig %description libs This package contains the libraries for groonga +%package server-common +Summary: Common packages for the groonga server and the groonga HTTP server +Group: Applications/Text +License: LGPLv2 +Requires: %{name} = %{version}-%{release} +Requires(pre): shadow-utils + +%description server-common +This package provides common settings for server use + %package server Summary: Groonga server Group: Applications/Text @@ -206,7 +216,7 @@ cd %{_builddir}/%{name}-%{version}/bindings/php make install INSTALL_ROOT=$RPM_BUILD_ROOT INSTALL="install -p" -%pre server +%pre server-common getent group groonga >/dev/null || groupadd -r groonga getent passwd groonga >/dev/null || \ useradd -r -g groonga -d %{_localstatedir}/lib/groonga -s /sbin/nologin \ @@ -218,13 +228,6 @@ if [ $1 = 1 ] ; then /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi -%pre httpd -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 httpd if [ $1 = 1 ] ; then /bin/systemctl daemon-reload >/dev/null 2>&1 || : @@ -295,6 +298,8 @@ fi %{_libdir}/groonga/plugins/table/table.so %{_datadir}/groonga/ +%files server-common + %files server %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/groonga/ -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...Download