Author: baggins Date: Mon Mar 1 16:34:07 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 2 - use ruby 1.9 compatible macros
---- Files affected: packages/hyperestraier: hyperestraier.spec (1.30 -> 1.31) , hyperestraier-ruby1.9.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/hyperestraier/hyperestraier.spec diff -u packages/hyperestraier/hyperestraier.spec:1.30 packages/hyperestraier/hyperestraier.spec:1.31 --- packages/hyperestraier/hyperestraier.spec:1.30 Wed Jul 16 23:00:25 2008 +++ packages/hyperestraier/hyperestraier.spec Mon Mar 1 17:34:01 2010 @@ -13,13 +13,14 @@ Summary(pl.UTF-8): Pełnotekstowy system wyszukiwawczy Name: hyperestraier Version: 1.4.13 -Release: 1 +Release: 2 License: LGPL Group: Applications/Text Source0: http://dl.sourceforge.net/hyperestraier/%{name}-%{version}.tar.gz # Source0-md5: 847aefb9e23266545280378d797f3981 Source1: %{name}.sh Patch0: %{name}-am_ac.patch +Patch1: %{name}-ruby1.9.patch URL: http://hyperestraier.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -148,6 +149,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__libtoolize} @@ -327,6 +329,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.31 2010/03/01 16:34:01 baggins +- rel 2 +- use ruby 1.9 compatible macros + Revision 1.30 2008/07/16 21:00:25 twittner - up to 1.4.13 - updated -am_ac.patch ================================================================ Index: packages/hyperestraier/hyperestraier-ruby1.9.patch diff -u /dev/null packages/hyperestraier/hyperestraier-ruby1.9.patch:1.1 --- /dev/null Mon Mar 1 17:34:07 2010 +++ packages/hyperestraier/hyperestraier-ruby1.9.patch Mon Mar 1 17:34:01 2010 @@ -0,0 +1,51 @@ +--- hyperestraier-1.4.13/rubynative/src/estraier.c.orig 2007-04-12 03:52:50.000000000 +0200 ++++ hyperestraier-1.4.13/rubynative/src/estraier.c 2010-03-01 17:32:17.000000000 +0100 +@@ -351,7 +351,7 @@ + vdoc = rb_iv_get(vself, VNDATA); + Data_Get_Struct(vdoc, ESTDOC, doc); + Check_Type(vwords, T_ARRAY); +- len = RARRAY(vwords)->len; ++ len = RARRAY_LEN(vwords); + for(i = 0; i < len; i++){ + Check_Type(rb_ary_entry(vwords, i), T_STRING); + } +@@ -764,7 +764,7 @@ + CBMAP *hints; + int i, dnum, *res, rnum; + Check_Type(vdbs, T_ARRAY); +- dnum = RARRAY(vdbs)->len; ++ dnum = RARRAY_LEN(vdbs); + dbs = cbmalloc(dnum * sizeof(ESTMTDB *) + 1); + for(i = 0; i < dnum; i++){ + vdb = rb_ary_entry(vdbs, i); +@@ -1189,10 +1189,10 @@ + VALUE str; + int i, len; + list = cblistopen(); +- len = RARRAY(obj)->len; ++ len = RARRAY_LEN(obj); + for(i = 0; i < len; i++){ + str = rb_ary_entry(obj, i); +- cblistpush(list, RSTRING(str)->ptr, RSTRING(str)->len); ++ cblistpush(list, RSTRING_PTR(str), RSTRING_LEN(str)); + } + return list; + } +@@ -1218,14 +1218,14 @@ + int i, len; + map = cbmapopenex(31); + keys = rb_funcall(obj, rb_intern("keys"), 0); +- len = RARRAY(keys)->len; ++ len = RARRAY_LEN(keys); + for(i = 0; i < len; i++){ + key = rb_ary_entry(keys, i); + val = rb_hash_aref(obj, key); + key = rb_String(key); + val = rb_String(val); +- cbmapput(map, RSTRING(key)->ptr, RSTRING(key)->len, +- RSTRING(val)->ptr, RSTRING(val)->len, 0); ++ cbmapput(map, RSTRING_PTR(key), RSTRING_LEN(key), ++ RSTRING_PTR(val), RSTRING_LEN(val), 0); + } + return map; + } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hyperestraier/hyperestraier.spec?r1=1.30&r2=1.31&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
