[Fedora-i18n-bugs] [groonga/f14/master] Update to 1.0.4-1.
Daiki Ueno
ueno at fedoraproject.org
Mon Nov 29 06:33:13 UTC 2010
commit dc461912b79d1f498ba275e1c5bba1fa4ec91934
Author: Daiki Ueno <ueno at unixuser.org>
Date: Mon Nov 29 15:37:25 2010 +0900
Update to 1.0.4-1.
.gitignore | 1 +
groonga.spec | 37 +++++++++++++++++--------------------
sources | 2 +-
3 files changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d5dffa..ffa4804 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/groonga-1.0.2.tar.gz
/groonga-1.0.3.tar.gz
+/groonga-1.0.4.tar.gz
diff --git a/groonga.spec b/groonga.spec
index e9e31e8..828d158 100644
--- a/groonga.spec
+++ b/groonga.spec
@@ -1,7 +1,7 @@
%global php_extdir %(php-config --extension-dir 2>/dev/null || echo "undefined")
Name: groonga
-Version: 1.0.3
+Version: 1.0.4
Release: 1%{?dist}
Summary: An Embeddable Fulltext Search Engine
@@ -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}
@@ -222,7 +214,7 @@ fi
%config(noreplace) %{_sysconfdir}/sysconfig/groonga
%{_bindir}/*
%{_initddir}/*
-%attr(0755,groonga,groonga) %dir %{_localstatedir}/run/%{name}
+%ghost %dir %{_localstatedir}/run/%{name}
%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}
%attr(0755,groonga,groonga) %dir %{_localstatedir}/lib/%{name}/db
@@ -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,13 @@ 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/*.
+
* Fri Oct 09 2010 Kouhei Sutou <kou at clear-code.com> - 1.0.3-1
- new upstream release.
diff --git a/sources b/sources
index 84c2ec9..b0f0dc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f9e5c1742a24512e397245334e5e84a4 groonga-1.0.3.tar.gz
+b770f5917f6d9e7ceea53087c637a064 groonga-1.0.4.tar.gz
More information about the i18n-bugs
mailing list