null+****@clear*****
null+****@clear*****
2010年 9月 2日 (木) 18:31:07 JST
Kouhei Sutou 2010-09-02 09:31:07 +0000 (Thu, 02 Sep 2010)
New Revision: ae3d6da56deba0405088a49737ee33b9987a29f8
Log:
split Fedora packages.
Added files:
rpm/Makefile.am
rpm/centos/Makefile.am
rpm/fedora/Makefile.am
Modified files:
Makefile.am
configure.ac
rpm/fedora/groonga.spec.in
Modified: Makefile.am (+2 -2)
===================================================================
--- Makefile.am 2010-09-02 08:44:00 +0000 (c3a0157)
+++ Makefile.am 2010-09-02 09:31:07 +0000 (30da23b)
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = 1.9.7
-SUBDIRS = lib modules src examples test apt yum data resource doc
+SUBDIRS = lib modules src examples test apt rpm yum data resource doc
#dist_data_DATA =
-EXTRA_DIST = bindings rpm version-gen.sh
+EXTRA_DIST = bindings version-gen.sh
pkginclude_HEADERS = groonga.h
pkgconfigdir = $(libdir)/pkgconfig
Modified: configure.ac (+3 -0)
===================================================================
--- configure.ac 2010-09-02 08:44:00 +0000 (a5f5ef5)
+++ configure.ac 2010-09-02 09:31:07 +0000 (9034263)
@@ -94,6 +94,9 @@ AC_CONFIG_FILES([Makefile
modules/suggest/Makefile
examples/Makefile
apt/Makefile
+ rpm/Makefile
+ rpm/centos/Makefile
+ rpm/fedora/Makefile
yum/Makefile
data/Makefile
data/munin/Makefile
Added: rpm/Makefile.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ rpm/Makefile.am 2010-09-02 09:31:07 +0000 (06031c9)
@@ -0,0 +1 @@
+SUBDIRS = centos fedora
Added: rpm/centos/Makefile.am (+2 -0) 100644
===================================================================
--- /dev/null
+++ rpm/centos/Makefile.am 2010-09-02 09:31:07 +0000 (321bd0c)
@@ -0,0 +1,2 @@
+EXTRA_DIST = groonga.spec.in
+noinst_DATA = groonga.spec
Added: rpm/fedora/Makefile.am (+2 -0) 100644
===================================================================
--- /dev/null
+++ rpm/fedora/Makefile.am 2010-09-02 09:31:07 +0000 (321bd0c)
@@ -0,0 +1,2 @@
+EXTRA_DIST = groonga.spec.in
+noinst_DATA = groonga.spec
Modified: rpm/fedora/groonga.spec.in (+110 -10)
===================================================================
--- rpm/fedora/groonga.spec.in 2010-09-02 08:44:00 +0000 (c09e566)
+++ rpm/fedora/groonga.spec.in 2010-09-02 09:31:07 +0000 (f57a747)
@@ -5,7 +5,7 @@ Summary: An Embeddable Fulltext Search Engine
Group: Applications/Text
License: LGPLv2
-URL: http://groonga.org
+URL: http://groonga.org/
Source0: http://groonga.org/files/groonga/groonga-@VERSION@.tar.gz
BuildRequires: mecab-devel
@@ -13,7 +13,6 @@ BuildRequires: libedit-devel
# to avoid binary-or-shlib-defines-rpath, we need to regenerate
# configure and libtool scripts
BuildRequires: autoconf, automake, libtool
-Requires: mecab
Requires: %{name}-libs = %{version}-%{release}
%description
@@ -30,6 +29,13 @@ License: LGPLv2
%description libs
This package contains the libraries for groonga
+%package doc
+Summary: Documentation for groonga
+Group: Documentation
+
+%description doc
+Documentation for groonga
+
%package devel
Summary: Libraries and header files for groonga
Group: Development/Libraries
@@ -38,6 +44,24 @@ Requires: %{name}-libs = %{version}-%{release}
%description devel
Libraries and header files for groonga
+%package tokenizer-mecab
+Summary: MeCab tokenizer for groonga
+Group: Applications/Text
+Requires: %{name}-libs = %{version}-%{release}
+Requires: mecab
+
+%description tokenizer-mecab
+MeCab tokenizer for groonga
+
+%package munin-plugins
+Summary: Munin plugins for groonga
+Group: Applications/System
+Requires: %{name}-libs = %{version}-%{release}
+Requires: munin-node
+
+%description munin-plugins
+Munin plugins for groonga
+
%prep
%setup -q
@@ -46,6 +70,7 @@ Libraries and header files for groonga
# to avoid binary-or-shlib-defines-rpath, we need to regenerate
# configure and libtool scripts
autoreconf -f -i
+%define optflags -O0
%configure
make %{?_smp_mflags}
@@ -53,31 +78,95 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/groonga/modules/functions/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/groonga/modules/functions/*.a
-rm $RPM_BUILD_ROOT%{_libdir}/groonga/modules/tokenizers/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/groonga/modules/tokenizers/*.a
+rm $RPM_BUILD_ROOT%{_libdir}/groonga/modules/*/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/groonga/modules/*/*.a
rm $RPM_BUILD_ROOT%{_libdir}/*.la
+mv $RPM_BUILD_ROOT%{_datadir}/groonga/munin/ $RPM_BUILD_ROOT%{_datadir}/
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/munin/plugin-conf.d/
+cat <<EOC > $RPM_BUILD_ROOT%{_sysconfdir}/munin/plugin-conf.d/groonga
+[groonga_*]
+ user groonga
+ group groonga
+ env.PATH /usr/bin:/bin:/usr/local/bin
+ env.pid_file /var/run/groonga/groonga.pid
+ env.path /var/lib/groonga/db/db
+ env.host 127.0.0.1
+ env.port 10041
+ env.log_path /var/log/groonga/query.log
+EOC
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+if ! /usr/bin/getent group groonga &>/dev/null; then
+ /usr/sbin/groupadd -r groonga || \
+ %logmsg "Unexpected error adding group \"groonga\". Aborting installation."
+fi
+if ! /usr/bin/id groonga &>/dev/null; then
+ /usr/sbin/useradd -r -s /sbin/nologin -c 'milter manager' \
+ -d %{_localstatedir}/lib/groonga --create-home \
+ -g groonga groonga || \
+ %logmsg "Unexpected error adding user \"groonga\". Aborting installation."
+fi
+
+%post
+/sbin/chkconfig --add groonga
+/bin/mkdir -p /var/run/groonga
+/bin/chown -R groonga:groonga /var/run/groonga
%post libs -p /sbin/ldconfig
+
+%post munin-plugins
+/usr/sbin/munin-node-configure --shell --remove-also | grep -e 'groonga_' | sh
+[ -f /var/lock/subsys/munin-node ] && \
+ /sbin/service munin-node restart > /dev/null 2>&1
+:
+
+%preun
+if [ $1 -eq 0 ] ; then
+ /sbin/service groonga stop > /dev/null 2>&1
+ /sbin/chkconfig --del groonga
+fi
+
+%postun
+if [ $1 -ge 1 ] ; then
+ /sbin/service groonga condrestart > /dev/null 2>&1
+fi
+
+if [ $1 -eq 0 ]; then
+ /usr/sbin/userdel -r milter-manager || \
+ %logmsg "User \"milter-manager\" could not be deleted."
+fi
+
%postun libs -p /sbin/ldconfig
+%postun munin-plugins
+if [ $1 -eq 0 ]; then
+ rm %{_sysconfdir}/munin/plugins/groongar_* > /dev/null 2>&1
+ [ -f /var/lock/subsys/munin-node ] && \
+ /sbin/service munin-node restart > /dev/null 2>&1
+ :
+fi
+
+
%files
%defattr(-,root,root,-)
+%doc %{_datadir}/man/
+%config %{_sysconfdir}/groonga/
%{_bindir}/*
%files libs
%defattr(-,root,root,-)
-%doc README AUTHORS COPYING doc/*
+%doc README AUTHORS COPYING
%{_libdir}/*.so.*
-%{_libdir}/groonga/modules/functions/*.so
-%{_libdir}/groonga/modules/tokenizers/*.so
-%{_datadir}/groonga/
+%{_libdir}/groonga/modules/suggest/*.so
+%{_datadir}/groonga/admin_html/
+
+%files doc
+%defattr(-,root,root,-)
+%doc %{_datadir}/groonga/doc/
%files devel
%defattr(-, root, root)
@@ -86,7 +175,18 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.a
%{_libdir}/pkgconfig/groonga*.pc
+%files tokenizer-mecab
+%defattr(-, root, root)
+%{_libdir}/groonga/modules/tokenizers/mecab.so
+
+%files munin-plugins
+%defattr(-, root, root)
+%{_datadir}/munin/
+%config %{_sysconfdir}/munin/plugin-conf.d/
%changelog
+* Thu Sep 02 2010 Kouhei Sutou <kou****@clear*****> - 1.0.0-1
+- split packages.
+
* Tue Aug 24 2010 Daiki Ueno <dueno****@redha*****> - 0.7.6-1
- initial packaging for Fedora