[Fedora-i18n-bugs] [groonga/f14] Update to 1.2.3-1.

[Daiki Ueno]

commit 163ec8e8d830f56ecc540e7bfaba04a41b6a7511
Author: Daiki Ueno <ueno(a)unixuser.org&gt;
Date:   Mon Jul 4 12:42:49 2011 +0900

    Update to 1.2.3-1.

 .gitignore                         |    1 +
 groonga-invalid-pointer-diff.patch |   12 ++++++++++++
 groonga.spec                       |   27 +++++++++++++++++++++++++--
 sources                            |    2 +-
 4 files changed, 39 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 63608c7..3ceefac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /groonga-1.2.0.tar.gz
 /groonga-1.2.1.tar.gz
 /groonga-1.2.2.tar.gz
+/groonga-1.2.3.tar.gz
diff --git a/groonga-invalid-pointer-diff.patch b/groonga-invalid-pointer-diff.patch
new file mode 100644
index 0000000..aa86b5e
--- /dev/null
+++ b/groonga-invalid-pointer-diff.patch
@@ -0,0 +1,12 @@
+diff -ru groonga-1.2.3.orig/src/groonga.c groonga-1.2.3/src/groonga.c
+--- groonga-1.2.3.orig/src/groonga.c	2011-06-28 21:51:56.617954085 +0900
++++ groonga-1.2.3/src/groonga.c	2011-07-04 11:48:54.453158255 +0900
+@@ -198,7 +198,7 @@
+         p += wcrtomb(p, es[i], &ps);
+       }
+       p[0] = '\0';
+-      len = p - buf;
++      len = p - (char *)buf;
+     } else {
+       len = 0;
+     }
diff --git a/groonga.spec b/groonga.spec
index 76703a1..392b649 100644
--- a/groonga.spec
+++ b/groonga.spec
@@ -1,14 +1,15 @@
 %global php_extdir  %(php-config --extension-dir 2>/dev/null || echo
"undefined")
 
 Name:		groonga
-Version:	1.2.2
+Version:	1.2.3
 Release:	1%{?dist}
 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://packages.groonga.org/source/groonga/groonga-%{version}.tar.gz
+Patch0:		groonga-invalid-pointer-diff.patch
 
 BuildRequires:	mecab-devel
 #BuildRequires:	messagepack-devel
@@ -16,6 +17,7 @@ BuildRequires:	zeromq-devel
 BuildRequires:	libevent-devel
 BuildRequires:	python2-devel
 BuildRequires:	php-devel
+BuildRequires:	ruby
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	%{name}-plugin-suggest = %{version}-%{release}
 Requires:	%{name}-tokenizer-mecab = %{version}-%{release}
@@ -71,6 +73,14 @@ Requires:	%{name}-libs = %{version}-%{release}
 %description devel
 Libraries and header files for groonga
 
+%package tools
+Summary:       Tools for groonga
+Group:         Development/Tools
+Requires:      ruby
+
+%description tools
+Tools for groonga
+
 %package tokenizer-mecab
 Summary:	MeCab tokenizer for groonga
 Group:		Applications/Text
@@ -120,6 +130,7 @@ PHP language binding for groonga
 %prep
 #% define optflags -O0
 %setup -q
+%patch0 -p1 -b .invalid-pointer-diff
 
 
 %build
@@ -270,6 +281,10 @@ fi
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/groonga*.pc
 
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/groonga-query-log-analyzer
+
 %files tokenizer-mecab
 %defattr(-,root,root,-)
 %{_libdir}/groonga/plugins/tokenizers/mecab.so
@@ -294,6 +309,14 @@ fi
 %{php_extdir}/groonga.so
 
 %changelog
+* Mon Jul  4 2011 Daiki Ueno <dueno(a)redhat.com&gt; - 1.2.3-1
+- build in fedora
+- add ruby to BR
+
+* Wed Jun 29 2011 Kouhei Sutou <kou(a)clear-code.com&gt; - 1.2.3-0
+- new upstream release.
+- add a new groong-tools package.
+
 * Tue May 31 2011 Daiki Ueno <dueno(a)redhat.com&gt; - 1.2.2-1
 - build in fedora
 
diff --git a/sources b/sources
index fc9ad89..4fc9396 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc1f8088b144837b02570c21046b04d5  groonga-1.2.2.tar.gz
+f259e7a135965276e6750d0225a67cfc  groonga-1.2.3.tar.gz