[Fedora-i18n-bugs] [groonga] follow groonga 1.0.4 changes.
Daiki Ueno
ueno at fedoraproject.org
Mon Nov 29 06:24:04 UTC 2010
commit 1cb9160bc59ab70b01f19253a61c0a88bca8645a
Author: Kouhei Sutou <kou at cozmixng.org>
Date: Thu Nov 25 20:55:42 2010 +0900
follow groonga 1.0.4 changes.
* move groonga.h to $top_srcdir/include/ from $top_srcdir/.
* modules/ -> plugins/.
groonga.spec | 34 ++++++++++++++--------------------
1 files changed, 14 insertions(+), 20 deletions(-)
---
diff --git a/groonga.spec b/groonga.spec
index 5dd596f..828d158 100644
--- a/groonga.spec
+++ b/groonga.spec
@@ -1,8 +1,8 @@
%global php_extdir %(php-config --extension-dir 2>/dev/null || echo "undefined")
Name: groonga
-Version: 1.0.3
-Release: 2%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
Summary: An Embeddable Fulltext Search Engine
Group: Applications/Text
@@ -105,12 +105,8 @@ make %{?_smp_mflags}
# build python binding
cd %{_builddir}/%{name}-%{version}/bindings/python/ql
python setup.py config
-mkdir groonga
-cd groonga
-ln -sf %{_builddir}/%{name}-%{version}/groonga.h
-cd ..
sed -i.cflags -e 's|^cflags =.*|cflags = []|' setup.py
-CFLAGS=-I.
+CFLAGS=-I%{_builddir}/%{name}-%{version}/include
export CFLAGS
LDFLAGS=-L%{_builddir}/%{name}-%{version}/lib/.libs
export LDFLAGS
@@ -118,24 +114,20 @@ python setup.py build
# build php binding
cd %{_builddir}/%{name}-%{version}/bindings/php
-mkdir -p include/groonga
-pushd include/groonga
-ln -sf %{_builddir}/%{name}-%{version}/groonga.h
-popd
sed -i.ldflags -e 's|PHP_ADD_LIBRARY_WITH_PATH(groonga, .*)|PHP_ADD_LIBRARY(groonga, GROONGA_SHARED_LIBADD)|' config.m4
phpize
-CFLAGS="-I. %{optflags}"
+CFLAGS="%{optflags}"
export CFLAGS
LDFLAGS=-L%{_builddir}/%{name}-%{version}/lib/.libs
export LDFLAGS
# --with-groonga is only necessary to avoid error in configure
-%configure --disable-static --with-groonga=.
+%configure --disable-static --with-groonga=%{_builddir}/%{name}-%{version}
make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-rm $RPM_BUILD_ROOT%{_libdir}/groonga/modules/*/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/groonga/plugins/*/*.la
rm $RPM_BUILD_ROOT%{_libdir}/*.la
mkdir -p $RPM_BUILD_ROOT%{_initddir}
@@ -231,10 +223,10 @@ fi
%doc README AUTHORS COPYING
%{_libdir}/*.so.*
%dir %{_libdir}/groonga
-%dir %{_libdir}/groonga/modules
-%dir %{_libdir}/groonga/modules/suggest
-%{_libdir}/groonga/modules/suggest/*.so
-%dir %{_libdir}/groonga/modules/tokenizers
+%dir %{_libdir}/groonga/plugins
+%dir %{_libdir}/groonga/plugins/suggest
+%{_libdir}/groonga/plugins/suggest/*.so
+%dir %{_libdir}/groonga/plugins/tokenizers
%dir %{_datadir}/groonga
%{_datadir}/groonga/
@@ -250,7 +242,7 @@ fi
%files tokenizer-mecab
%defattr(-,root,root,-)
-%{_libdir}/groonga/modules/tokenizers/mecab.so
+%{_libdir}/groonga/plugins/tokenizers/mecab.so
%files munin-plugins
%defattr(-,root,root,-)
@@ -265,8 +257,10 @@ fi
%defattr(-,root,root,-)
%{php_extdir}/groonga.so
-
%changelog
+* Mon Nov 29 2010 Kouhei Sutou <kou at clear-code.com> - 1.0.4-1
+- new upstream release
+
* Wed Nov 24 2010 Daiki Ueno <dueno at redhat.com> - 1.0.3-2
- %%ghost /var/run/*.
More information about the i18n-bugs
mailing list