null+****@clear*****
null+****@clear*****
2010年 10月 1日 (金) 15:36:03 JST
Daiki Ueno 2010-10-01 06:36:03 +0000 (Fri, 01 Oct 2010)
New Revision: daa9b0e42dd03126b28bab54e314812f940fab41
Log:
Fix typo in init script and simplify RPM spec.
Modified files:
data/init.d/redhat/groonga
rpm/fedora/groonga.spec.in
Modified: data/init.d/redhat/groonga (+1 -1)
===================================================================
--- data/init.d/redhat/groonga 2010-10-01 05:44:24 +0000 (b00ace5)
+++ data/init.d/redhat/groonga 2010-10-01 06:36:03 +0000 (c3f101b)
@@ -133,7 +133,7 @@ restart() {
start
}
-satus() {
+status() {
ARGS=""
if [ -n "${PROTOCOL}" ]; then
ARGS="${ARGS} --protocol ${PROTOCOL}"
Modified: rpm/fedora/groonga.spec.in (+8 -10)
===================================================================
--- rpm/fedora/groonga.spec.in 2010-10-01 05:44:24 +0000 (141b9e0)
+++ rpm/fedora/groonga.spec.in 2010-10-01 06:36:03 +0000 (d4f427d)
@@ -6,12 +6,9 @@ Summary: An Embeddable Fulltext Search Engine
Group: Applications/Text
License: LGPLv2
URL: http://groonga.org/
-Source0: http://groonga.org/files/groonga/groonga-@VERSION@.tar.gz
+Source0: http://groonga.org/files/groonga/groonga-%{version}.tar.gz
BuildRequires: mecab-devel
-# to avoid binary-or-shlib-defines-rpath, we need to regenerate
-# configure and libtool scripts
-BuildRequires: autoconf, automake, libtool
Requires: %{name}-libs = %{version}-%{release}
%description
@@ -66,10 +63,9 @@ Munin plugins for groonga
%build
-# to avoid binary-or-shlib-defines-rpath, we need to regenerate
-# configure and libtool scripts
-autoreconf -f -i
-%configure
+%configure --disable-static
+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
make %{?_smp_mflags}
@@ -77,7 +73,6 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/groonga/modules/*/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/groonga/modules/*/*.a
rm $RPM_BUILD_ROOT%{_libdir}/*.la
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
@@ -181,7 +176,6 @@ fi
%defattr(-, root, root)
%{_includedir}/groonga/*
%{_libdir}/*.so
-%{_libdir}/*.a
%{_libdir}/pkgconfig/groonga*.pc
%files tokenizer-mecab
@@ -194,6 +188,10 @@ fi
%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/
%changelog
+* Fri Oct 1 2010 Daiki Ueno <dueno****@redha*****> - 1.0.2-2
+- don't require autotools when building
+- pass --disable-static to %%configure
+
* Thu Sep 09 2010 Kouhei Sutou <kou****@clear*****> - 1.0.2-1
- new upstream release.