packages: ruby-libextractor/ruby-libextractor.spec, ruby-libextractor/ruby-...

[baggins]

Author: baggins                      Date: Tue Mar  2 11:00:21 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- fix bnuilding with ruby 1.9

---- Files affected:
packages/ruby-libextractor:
   ruby-libextractor.spec (1.3 -> 1.4) , ruby-libextractor-ruby1.9.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ruby-libextractor/ruby-libextractor.spec
diff -u packages/ruby-libextractor/ruby-libextractor.spec:1.3 packages/ruby-libextractor/ruby-libextractor.spec:1.4
--- packages/ruby-libextractor/ruby-libextractor.spec:1.3	Tue Feb 13 09:06:44 2007
+++ packages/ruby-libextractor/ruby-libextractor.spec	Tue Mar  2 12:00:16 2010
@@ -1,17 +1,21 @@
 # $Revision$, $Date$
+%define pkgname libextractor
 Summary:	Ruby binding for libextractor
 Summary(pl.UTF-8):	Wiązanie języka Ruby dla biblioteki libextractor
-Name:		ruby-libextractor
+Name:		ruby-%{pkgname}
 Version:	0.9
-Release:	1
+Release:	2
 License:	GPL
 Group:		Development/Languages
-Source0:	http://gnunet.org/libextractor/download/libextractor-ruby-%{version}.tar.gz
+Source0:	http://gnunet.org/libextractor/download/%{pkgname}-ruby-%{version}.tar.gz
 # Source0-md5:	442f131710cad3dec22465698e25db1f
+Patch0:		%{name}-ruby1.9.patch
 URL:		http://gnunet.org/libextractor/
 BuildRequires:	libextractor-devel
-BuildRequires:	rpmbuild(macros) >= 1.277
+BuildRequires:	rpmbuild(macros) >= 1.484
+BuildRequires:	ruby >= 1:1.8.6
 BuildRequires:	ruby-devel
+BuildRequires:	ruby-modules
 %{?ruby_mod_ver_requires_eq}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -23,14 +27,15 @@
 
 %prep
 %setup -q -n libextractor-ruby-%{version}
+%patch0 -p1
 
 %build
-ruby extconf.rb
+%{__ruby} extconf.rb
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{ruby_rubylibdir}
 
 %{__make} install \
 	archdir=$RPM_BUILD_ROOT%{ruby_archdir} \
@@ -49,6 +54,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/03/02 11:00:16  baggins
+- rel 2
+- fix bnuilding with ruby 1.9
+
 Revision 1.3  2007/02/13 08:06:44  glen
 - tabs in preamble
 

================================================================
Index: packages/ruby-libextractor/ruby-libextractor-ruby1.9.patch
diff -u /dev/null packages/ruby-libextractor/ruby-libextractor-ruby1.9.patch:1.1
--- /dev/null	Tue Mar  2 12:00:22 2010
+++ packages/ruby-libextractor/ruby-libextractor-ruby1.9.patch	Tue Mar  2 12:00:16 2010
@@ -0,0 +1,45 @@
+--- libextractor-ruby-0.9/extractor.c~	2005-12-09 19:49:54.000000000 +0100
++++ libextractor-ruby-0.9/extractor.c	2010-03-02 11:58:37.866187355 +0100
+@@ -1,5 +1,5 @@
+ #include "ruby.h"
+-#include "intern.h"
++#include "ruby/intern.h"
+ #include <extractor.h>
+ 
+ static VALUE cExtractor;
+@@ -36,7 +36,7 @@
+     struct rbExctractor *extractor;
+     Check_Type(filename, T_STRING);
+     Data_Get_Struct(self, struct rbExctractor, extractor);
+-    keywords = EXTRACTOR_getKeywords(extractor->extractor, RSTRING(filename)->ptr);
++    keywords = EXTRACTOR_getKeywords(extractor->extractor, RSTRING_PTR(filename));
+     hash = rb_hash_new();
+     for(k=keywords; k; k=k->next) {
+         VALUE ary, key, value;
+@@ -59,7 +59,7 @@
+     struct rbExctractor *extractor;
+     Check_Type(data, T_STRING);
+     Data_Get_Struct(self, struct rbExctractor, extractor);
+-    keywords = EXTRACTOR_getKeywords2(extractor->extractor, RSTRING(data)->ptr, RSTRING(data)->len);
++    keywords = EXTRACTOR_getKeywords2(extractor->extractor, RSTRING_PTR(data), RSTRING_LEN(data));
+     hash = rb_hash_new();
+     for(k=keywords; k; k=k->next) {
+         VALUE ary, key, value;
+@@ -90,7 +90,7 @@
+ 
+ static VALUE ex_s_binary_encode(VALUE self, VALUE data) {
+     char *ptr;
+-    ptr = EXTRACTOR_binaryEncode((unsigned char *)RSTRING(data)->ptr,RSTRING(data)->len);
++    ptr = EXTRACTOR_binaryEncode((unsigned char *)RSTRING_PTR(data),RSTRING_LEN(data));
+     return ptr ? rb_str_new2(ptr) : Qnil;
+ }
+ 
+@@ -98,7 +98,7 @@
+     int ret;
+     unsigned char *buf;
+     size_t size;
+-    ret = EXTRACTOR_binaryDecode(RSTRING(encoded)->ptr, &buf, &size);
++    ret = EXTRACTOR_binaryDecode(RSTRING_PTR(encoded), &buf, &size);
+     if (ret) {
+         rb_raise(rb_eStandardError, "decode error");
+     }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-libextractor/ruby-libextractor.spec?r1=1.3&r2=1.4&f=u