packages: ruby-sary/ruby-sary-no-version.patch (NEW), ruby-sary/ruby-sary-r...
baggins
baggins at pld-linux.org
Wed Jul 13 23:09:13 CEST 2011
Author: baggins Date: Wed Jul 13 21:09:13 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- initial revision
---- Files affected:
packages/ruby-sary:
ruby-sary-no-version.patch (NONE -> 1.1) (NEW), ruby-sary-ruby19.patch (NONE -> 1.1) (NEW), ruby-sary.spec (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/ruby-sary/ruby-sary-no-version.patch
diff -u /dev/null packages/ruby-sary/ruby-sary-no-version.patch:1.1
--- /dev/null Wed Jul 13 23:09:13 2011
+++ packages/ruby-sary/ruby-sary-no-version.patch Wed Jul 13 23:09:08 2011
@@ -0,0 +1,130 @@
+--- sary-ruby-1.2.0/builder.c~ 2005-03-30 00:48:09.000000000 +0200
++++ sary-ruby-1.2.0/builder.c 2011-07-13 22:51:03.914144563 +0200
+@@ -26,7 +26,6 @@
+ #include <errno.h>
+ #include "sary.h"
+ #include "ruby.h"
+-#include "version.h"
+
+ #define GET_Builder(obj, dat) Data_Get_Struct(obj, SaryBuilder, dat)
+
+@@ -63,21 +62,13 @@
+ rb_scan_args(argc, argv, "11", &file_name, &array_name);
+
+ Check_SafeStr(file_name);
+-#if RUBY_VERSION_CODE >= 180
+ file_name_ptr = StringValuePtr(file_name);
+-#else
+- file_name_ptr = STR2CSTR(file_name);
+-#endif
+
+ if (array_name == Qnil)
+ builder = sary_builder_new(file_name_ptr);
+ else {
+ Check_SafeStr(array_name);
+-#if RUBY_VERSION_CODE >= 180
+ array_name_ptr = StringValuePtr(array_name);
+-#else
+- array_name_ptr = STR2CSTR(array_name);
+-#endif
+ builder = sary_builder_new2(file_name_ptr, array_name_ptr);
+ }
+ if (builder == NULL)
+--- sary-ruby-1.2.0/searcher.c~ 2005-03-30 00:48:09.000000000 +0200
++++ sary-ruby-1.2.0/searcher.c 2011-07-13 22:52:14.112144511 +0200
+@@ -27,7 +27,6 @@
+ #include <errno.h>
+ #include "sary.h"
+ #include "ruby.h"
+-#include "version.h"
+
+ #define GET_Searcher(obj, dat) Data_Get_Struct(obj, SarySearcher, dat)
+
+@@ -82,21 +81,13 @@
+ rb_scan_args(argc, argv, "11", &file_name, &array_name);
+
+ Check_SafeStr(file_name);
+-#if RUBY_VERSION_CODE >= 180
+ file_name_ptr = StringValuePtr(file_name);
+-#else
+- file_name_ptr = STR2CSTR(file_name);
+-#endif
+
+ if (array_name == Qnil)
+ searcher = sary_searcher_new(file_name_ptr);
+ else {
+ Check_SafeStr(array_name);
+-#if RUBY_VERSION_CODE >= 180
+ array_name_ptr = StringValuePtr(array_name);
+-#else
+- array_name_ptr = STR2CSTR(array_name);
+-#endif
+ searcher = sary_searcher_new2(file_name_ptr, array_name_ptr);
+ }
+ if (searcher == NULL)
+@@ -133,12 +124,8 @@
+ GET_Searcher(klass, searcher);
+
+ Check_SafeStr(pattern);
+-#if RUBY_VERSION_CODE >= 180
+ pat = StringValuePtr(pattern);
+ len = RSTRING(pattern)->len;
+-#else
+- pat = str2cstr(pattern, &len);
+-#endif
+
+ if (sary_searcher_search2(searcher, pat, len))
+ return Qtrue;
+@@ -166,11 +153,7 @@
+ for (i = 0; i < len; i++) {
+ pattern = rb_ary_entry(pattern_array, (long)i);
+ Check_SafeStr(pattern);
+-#if RUBY_VERSION_CODE >= 180
+ pat[i] = StringValuePtr(pattern);
+-#else
+- pat[i] = STR2CSTR(pattern);
+-#endif
+ }
+
+ if (sary_searcher_multi_search(searcher, pat, len))
+@@ -189,11 +172,7 @@
+ GET_Searcher(klass, searcher);
+
+ Check_SafeStr(pattern);
+-#if RUBY_VERSION_CODE >= 180
+ pat = StringValuePtr(pattern);
+-#else
+- pat = STR2CSTR(pattern);
+-#endif
+
+ if (sary_searcher_isearch(searcher, pat, NUM2INT(len)))
+ return Qtrue;
+@@ -224,12 +203,8 @@
+ GET_Searcher(klass, searcher);
+
+ Check_SafeStr(pattern);
+-#if RUBY_VERSION_CODE >= 180
+ pat = StringValuePtr(pattern);
+ len = RSTRING(pattern)->len;
+-#else
+- pat = str2cstr(pattern, &len);
+-#endif
+
+ if (sary_searcher_icase_search2(searcher, pat, len))
+ return Qtrue;
+@@ -275,15 +250,10 @@
+
+ Check_SafeStr(start_tag);
+ Check_SafeStr(end_tag);
+-#if RUBY_VERSION_CODE >= 180
+ stag = StringValuePtr(start_tag);
+ etag = StringValuePtr(end_tag);
+ slen = RSTRING(stag)->len;
+ elen = RSTRING(etag)->len;
+-#else
+- stag = rb_str2cstr(start_tag, &slen);
+- etag = rb_str2cstr(end_tag, &elen);
+-#endif
+
+ region = sary_searcher_get_next_tagged_region2(searcher, stag, slen,
+ etag, elen, &rlen);
================================================================
Index: packages/ruby-sary/ruby-sary-ruby19.patch
diff -u /dev/null packages/ruby-sary/ruby-sary-ruby19.patch:1.1
--- /dev/null Wed Jul 13 23:09:13 2011
+++ packages/ruby-sary/ruby-sary-ruby19.patch Wed Jul 13 23:09:08 2011
@@ -0,0 +1,104 @@
+--- sary-ruby-1.2.0/searcher.c~ 2011-07-13 22:53:11.748144500 +0200
++++ sary-ruby-1.2.0/searcher.c 2011-07-13 22:55:25.639144500 +0200
+@@ -80,13 +80,13 @@
+
+ rb_scan_args(argc, argv, "11", &file_name, &array_name);
+
+- Check_SafeStr(file_name);
++ SafeStringValue(file_name);
+ file_name_ptr = StringValuePtr(file_name);
+
+ if (array_name == Qnil)
+ searcher = sary_searcher_new(file_name_ptr);
+ else {
+- Check_SafeStr(array_name);
++ SafeStringValue(array_name);
+ array_name_ptr = StringValuePtr(array_name);
+ searcher = sary_searcher_new2(file_name_ptr, array_name_ptr);
+ }
+@@ -123,9 +123,9 @@
+
+ GET_Searcher(klass, searcher);
+
+- Check_SafeStr(pattern);
++ SafeStringValue(pattern);
+ pat = StringValuePtr(pattern);
+- len = RSTRING(pattern)->len;
++ len = RSTRING_LEN(pattern);
+
+ if (sary_searcher_search2(searcher, pat, len))
+ return Qtrue;
+@@ -144,7 +144,7 @@
+
+ GET_Searcher(klass, searcher);
+
+- len = RARRAY(pattern_array)->len;
++ len = RARRAY_LEN(pattern_array);
+ if (len == 0) {
+ return Qfalse;
+ }
+@@ -152,7 +152,7 @@
+ pat = ALLOCA_N(char*, len);
+ for (i = 0; i < len; i++) {
+ pattern = rb_ary_entry(pattern_array, (long)i);
+- Check_SafeStr(pattern);
++ SafeStringValue(pattern);
+ pat[i] = StringValuePtr(pattern);
+ }
+
+@@ -171,7 +171,7 @@
+
+ GET_Searcher(klass, searcher);
+
+- Check_SafeStr(pattern);
++ SafeStringValue(pattern);
+ pat = StringValuePtr(pattern);
+
+ if (sary_searcher_isearch(searcher, pat, NUM2INT(len)))
+@@ -202,9 +202,9 @@
+
+ GET_Searcher(klass, searcher);
+
+- Check_SafeStr(pattern);
++ SafeStringValue(pattern);
+ pat = StringValuePtr(pattern);
+- len = RSTRING(pattern)->len;
++ len = RSTRING_LEN(pattern);
+
+ if (sary_searcher_icase_search2(searcher, pat, len))
+ return Qtrue;
+@@ -248,12 +248,12 @@
+ if (sary_searcher_count_occurrences(searcher) == 0)
+ return Qnil;
+
+- Check_SafeStr(start_tag);
+- Check_SafeStr(end_tag);
++ SafeStringValue(start_tag);
++ SafeStringValue(end_tag);
+ stag = StringValuePtr(start_tag);
+ etag = StringValuePtr(end_tag);
+- slen = RSTRING(stag)->len;
+- elen = RSTRING(etag)->len;
++ slen = RSTRING_LEN(stag);
++ elen = RSTRING_LEN(etag);
+
+ region = sary_searcher_get_next_tagged_region2(searcher, stag, slen,
+ etag, elen, &rlen);
+--- sary-ruby-1.2.0/builder.c~ 2011-07-13 22:53:11.746144500 +0200
++++ sary-ruby-1.2.0/builder.c 2011-07-13 22:58:23.855144501 +0200
+@@ -61,13 +61,13 @@
+
+ rb_scan_args(argc, argv, "11", &file_name, &array_name);
+
+- Check_SafeStr(file_name);
++ SafeStringValue(file_name);
+ file_name_ptr = StringValuePtr(file_name);
+
+ if (array_name == Qnil)
+ builder = sary_builder_new(file_name_ptr);
+ else {
+- Check_SafeStr(array_name);
++ SafeStringValue(array_name);
+ array_name_ptr = StringValuePtr(array_name);
+ builder = sary_builder_new2(file_name_ptr, array_name_ptr);
+ }
================================================================
Index: packages/ruby-sary/ruby-sary.spec
diff -u /dev/null packages/ruby-sary/ruby-sary.spec:1.1
--- /dev/null Wed Jul 13 23:09:13 2011
+++ packages/ruby-sary/ruby-sary.spec Wed Jul 13 23:09:08 2011
@@ -0,0 +1,59 @@
+# $Revision$, $Date$
+%define pkgname sary
+Summary: Ruby Binding of Sary
+Name: ruby-%{pkgname}
+Version: 1.2.0
+Release: 1
+License: LGPL
+Source0: http://sary.sourceforge.net/%{pkgname}-ruby-%{version}.tar.gz
+# Source0-md5: c885abffea72f25cb0f6286770a78ac1
+Patch0: %{name}-no-version.patch
+Patch1: %{name}-ruby19.patch
+Group: Development/Languages
+URL: http://sary.sourceforge.net/
+BuildRequires: rpmbuild(macros) >= 1.484
+BuildRequires: ruby >= 1:1.8.6
+BuildRequires: ruby-modules
+BuildRequires: sary-devel
+BuildRequires: pkgconfig
+%{?ruby_mod_ver_requires_eq}
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Ruby Binding of Sary.
+
+%prep
+%setup -q -n %{pkgname}-ruby-%{version}
+%patch0 -p1
+%patch1 -p1
+
+%build
+%{__ruby} extconf.rb
+%{__make} \
+ CC="%{__cc}" \
+ LDFLAGS="%{rpmldflags}" \
+ CFLAGS="%{rpmcflags} -fPIC `pkg-config glib --cflags`"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc ChangeLog README*
+%attr(755,root,root) %{ruby_sitearchdir}/%{pkgname}.so
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <feedback at pld-linux.org>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.1 2011/07/13 21:09:08 baggins
+- initial revision
+
================================================================
More information about the pld-cvs-commit
mailing list