[cmigemo/f14/master] Moved to googlecode, 20110227 is released
Mamoru Tasaka
mtasaka at fedoraproject.org
Wed Mar 9 17:00:28 UTC 2011
commit 85244b3e9d035ecdbce5b0b9d19c265ebde225fb
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Thu Mar 10 02:00:22 2011 +0900
Moved to googlecode, 20110227 is released
.gitignore | 1 +
cmigemo-20110227-compile.patch | 10 ++++
... => cmigemo-20110227-ignore-random-string.patch | 19 ++++----
cmigemo-20110227-keep-regex-with-brackets.patch | 35 ++++++++++++++
cmigemo.spec | 49 +++++++++++++++-----
sources | 2 +-
6 files changed, 94 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 029a3ed..a5bb1e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
cmigemo-1.3c-MIT.tar.bz2
+/cmigemo-default-src-20110227.zip
diff --git a/cmigemo-20110227-compile.patch b/cmigemo-20110227-compile.patch
new file mode 100644
index 0000000..415f36e
--- /dev/null
+++ b/cmigemo-20110227-compile.patch
@@ -0,0 +1,10 @@
+--- cmigemo-1.3e-rev176_trunk/src/wordbuf.c.compile 2010-04-22 01:16:17.000000000 +0900
++++ cmigemo-1.3e-rev176_trunk/src/wordbuf.c 2010-04-22 03:23:13.000000000 +0900
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <limits.h>
+ #include "wordbuf.h"
+
+ #define WORDLEN_DEF 64
diff --git a/cmigemo-1.3c-MIT-ignore-random-string.patch b/cmigemo-20110227-ignore-random-string.patch
similarity index 77%
rename from cmigemo-1.3c-MIT-ignore-random-string.patch
rename to cmigemo-20110227-ignore-random-string.patch
index c7914fd..1b7025e 100644
--- a/cmigemo-1.3c-MIT-ignore-random-string.patch
+++ b/cmigemo-20110227-ignore-random-string.patch
@@ -1,6 +1,6 @@
---- cmigemo-1.3c-MIT/src/migemo.c.random 2004-06-19 20:21:19.000000000 +0900
-+++ cmigemo-1.3c-MIT/src/migemo.c 2007-07-11 23:21:37.000000000 +0900
-@@ -388,9 +388,42 @@
+--- cmigemo-default-src/src/migemo.c.random 2011-02-27 19:45:40.000000000 +0900
++++ cmigemo-default-src/src/migemo.c 2011-03-09 00:35:08.000000000 +0900
+@@ -412,9 +412,42 @@
}
/*
@@ -30,7 +30,7 @@
+
+ }
+
-+ if (randomness >= 2) return 1;
++ if (randomness >= 3) return 1;
+ if (found_upper && (length <= 3)) return 1;
+ return 0;
+}
@@ -43,8 +43,8 @@
static wordlist_p
parse_query(migemo* object, const unsigned char* query)
{
-@@ -399,6 +432,8 @@
- const unsigned char *end = NULL;
+@@ -422,6 +455,8 @@
+ const unsigned char *start = NULL;
wordlist_p querylist = NULL, *pp = &querylist;
+ int random_query_p = too_random_string (query);
@@ -52,19 +52,20 @@
while (1)
{
int len, upper;
-@@ -406,13 +441,13 @@
+@@ -430,14 +465,14 @@
if (!object->char2int || (len = object->char2int(curr, NULL)) < 1)
len = 1;
start = curr;
- upper = (len == 1 && isupper(*curr) && isupper(curr[1]));
+ upper = (len == 1 && isupper(*curr) && isupper(curr[1]) && (!random_query_p));
curr += len;
+ sum += len;
while (1)
{
if (!object->char2int || (len = object->char2int(curr, NULL)) < 1)
len = 1;
- if (*curr == '\0' || (len == 1 && (isupper(*curr) != 0) != upper))
-+ if (*curr == '\0' || (len == 1 && ((isupper(*curr) != 0) != upper)) && (!random_query_p))
++ if (*curr == '\0' || (len == 1 && (isupper(*curr) != 0) != upper) && (!random_query_p))
break;
curr += len;
- }
+ sum += len;
diff --git a/cmigemo-20110227-keep-regex-with-brackets.patch b/cmigemo-20110227-keep-regex-with-brackets.patch
new file mode 100644
index 0000000..907d1ac
--- /dev/null
+++ b/cmigemo-20110227-keep-regex-with-brackets.patch
@@ -0,0 +1,35 @@
+--- cmigemo-default-src/src/rxgen.c.keepregex 2011-03-09 16:07:58.000000000 +0900
++++ cmigemo-default-src/src/rxgen.c 2011-03-09 12:02:31.000000000 +0900
+@@ -176,11 +176,11 @@
+ }
+ }
+
+- static rnode*
+-search_rnode(rnode* node, unsigned int code)
++ static rnode**
++search_rnode(rnode** node, unsigned int code)
+ {
+- while (node && node->code != code)
+- node = node->next;
++ while (*node && (*node)->code != code)
++ node = &(*node)->next;
+ return node;
+ }
+
+@@ -211,13 +211,14 @@
+ }
+ break;
+ }
+- pnode = search_rnode(*ppnode, code);
++ ppnode = search_rnode(ppnode, code);
++ pnode = *ppnode;
+ if (pnode == NULL)
+ {
+ /* code‚ðŽ‚ƒm[ƒh‚ª–³‚¢ê‡A쬒ljÁ‚·‚é */
+ pnode = rnode_new();
+ pnode->code = code;
+- pnode->next = *ppnode;
++ /*pnode->next = *ppnode;*/
+ *ppnode = pnode;
+ }
+ else if (pnode->child == NULL)
diff --git a/cmigemo.spec b/cmigemo.spec
index be8fb8f..59e05f2 100644
--- a/cmigemo.spec
+++ b/cmigemo.spec
@@ -1,8 +1,9 @@
-%define mainver 1.3
-%define minorver c-MIT
+%define mainver 1.3
+%define tarballver 20110227
+%define minorver date%{tarballver}
%define prerelease 1
-%define fedorarel 7
+%define fedorarel 8
%define uprel %(echo %{?minorver} | %{__sed} -e 's|^--*||' | %{__sed} -e 's|-|_|g' )
@@ -14,16 +15,18 @@
Name: cmigemo
Version: %{mainver}
-Release: %{rel}%{?dist}.4
+Release: %{rel}%{?dist}
Summary: C interface of Ruby/Migemo Japanese incremental search tool
Group: System Environment/Libraries
License: MIT
-URL: http://www.kaoriya.net/
-Source0: http://www.kaoriya.net/dist/var/%{name}-%{mainver}%{?minorver}.tar.bz2
-Patch0: cmigemo-1.3c-MIT-ignore-random-string.patch
+URL: http://www.kaoriya.net/software/cmigemo
+#Source0: http://www.kaoriya.net/dist/var/%{name}-%{mainver}%{?minorver}.tar.bz2
+Source0: http://cmigemo.googlecode.com/files/cmigemo-default-src-%{tarballver}.zip
+Patch0: cmigemo-20110227-ignore-random-string.patch
Patch1: cmigemo-1.3c-MIT-dont-escape.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch2: cmigemo-20110227-compile.patch
+Patch3: cmigemo-20110227-keep-regex-with-brackets.patch
BuildRequires: skkdic
@@ -35,16 +38,19 @@ by Romaji.
Summary: Development files for cmigemo
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?isa} = %{version}-%{release}
%description devel
This package contains libraries and header files for
developing applications that use cmigemo.
%prep
-%setup -q -n %{name}-%{version}%{?minorver}
+%setup -q -c -T %{name}-%{version} -a 0
+cd cmigemo-default-src/
%patch0 -p1 -b .random
%patch1 -p1 -b .escape
+%patch2 -p1 -b .build
+%patch3 -p1 -b .regex
# Change default command for configure
%{__sed} -i.command \
@@ -87,6 +93,8 @@ developing applications that use cmigemo.
%{__chmod} 0644 tools/*
%build
+cd cmigemo-default-src/
+%{__chmod} u+x configure
%configure
# parallel make unsafe
@@ -97,14 +105,23 @@ developing applications that use cmigemo.
( cd dict ; %{__make} utf-8 )
%install
-%{__rm} -rf $RPM_BUILD_ROOT
+pushd cmigemo-default-src/
+
%{__make} gcc-install prefix=$RPM_BUILD_ROOT%{_prefix}
# remove unneeded document
%{__rm} -rf $RPM_BUILD_ROOT%{_prefix}/doc/
+popd
+
# make documentation directory
%{__rm} -rf doc_install
+%{__rm} -rf tools
+
+pushd cmigemo-default-src/
+cp -a tools ..
+
+%{__rm} -rf doc_install
%{__mkdir} doc_install
cd doc
for f in *txt ; do \
@@ -112,9 +129,11 @@ for f in *txt ; do \
touch -r $f ../doc_install/$f || \
%{__cp} -p $f ../doc_install/$f
done
-%{__cp} -p LICENSE ../doc_install/
cd ..
+mv doc_install ..
+popd
+
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -137,6 +156,12 @@ cd ..
%{_libdir}/libmigemo.so
%changelog
+* Wed Mar 9 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.3-0.8.date20110227
+- Moved to googlecode, 20110227 is released
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-0.7.c_MIT.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- F-12: Rebuild for updated skkdic (for F12Beta)
diff --git a/sources b/sources
index f96224d..a24d41f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e411e678985f42501982c050e959035f cmigemo-1.3c-MIT.tar.bz2
+6e9b6f6ec96d4eb8bdd18e52b91e1b85 cmigemo-default-src-20110227.zip
More information about the scm-commits
mailing list