packages: rcsparse/rcsparse.spec, rcsparse/ruby19.patch (NEW) - add patch t...

[glen]

Author: glen                         Date: Mon Feb  7 23:32:03 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add patch to build with ruby19

---- Files affected:
packages/rcsparse:
   rcsparse.spec (1.8 -> 1.9) , ruby19.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/rcsparse/rcsparse.spec
diff -u packages/rcsparse/rcsparse.spec:1.8 packages/rcsparse/rcsparse.spec:1.9
--- packages/rcsparse/rcsparse.spec:1.8	Tue Feb  8 00:24:15 2011
+++ packages/rcsparse/rcsparse.spec	Tue Feb  8 00:31:58 2011
@@ -17,6 +17,7 @@
 Group:		Libraries
 Source0:	http://ww2.fs.ei.tum.de/~corecode/hg/rcsparse/archive/tip.tar.bz2#/%{name}.tbz2
 # Source0-md5:	360ad1d3e0410d30abea710ce758c396
+Patch0:		ruby19.patch
 URL:		http://ww2.fs.ei.tum.de/~corecode/hg/rcsparse/
 BuildRequires:	libtool
 %if %{with python}
@@ -24,7 +25,7 @@
 BuildRequires:	rpm-pythonprov
 %endif
 %if %{with ruby}
-BuildRequires:	ruby >= 1:1.8.6
+BuildRequires:	ruby >= 1:1.9
 BuildRequires:	ruby-modules
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,6 +63,7 @@
 %prep
 %setup -qc
 mv %{name}-*/* .
+%patch0 -p1
 
 %build
 libtool --tag=CC --mode=compile %{__cc} %{rpmcppflags} %{rpmcflags} -fPIC -shared -c rcsparse.c
@@ -134,6 +136,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2011/02/07 23:31:58  glen
+- add patch to build with ruby19
+
 Revision 1.8  2011/02/07 23:24:15  glen
 - up to 20090807 snap
 - add ruby package (builds with 1.8)

================================================================
Index: packages/rcsparse/ruby19.patch
diff -u /dev/null packages/rcsparse/ruby19.patch:1.1
--- /dev/null	Tue Feb  8 00:32:03 2011
+++ packages/rcsparse/ruby19.patch	Tue Feb  8 00:31:58 2011
@@ -0,0 +1,68 @@
+two replaces:
+
+%s#RSTRING(\(.\+\))->ptr#RSTRING_PTR(\1)#
+%s#RSTRING(\(.\+\))->len#RSTRING_LEN(\1)#
+
+--- rcsparse-0.1/rb-rcsparse.c~	2009-08-07 01:21:50.000000000 +0300
++++ rcsparse-0.1/rb-rcsparse.c	2011-02-08 01:27:55.126541917 +0200
+@@ -170,9 +170,9 @@
+ 	Data_Get_Struct(self, struct rb_rcsfile, rb_rf);
+ 	rb_scan_args(argc, argv, "1", &fname);
+ 	SafeStringValue(fname);
+-	rb_rf->rf = rcsopen(RSTRING(fname)->ptr);
++	rb_rf->rf = rcsopen(RSTRING_PTR(fname));
+ 	if (rb_rf->rf == NULL)
+-		rb_sys_fail(RSTRING(fname)->ptr);
++		rb_sys_fail(RSTRING_PTR(fname));
+ 	rb_rf->symbols = Qnil;
+ 	return self;
+ }
+@@ -311,7 +311,7 @@
+ 
+ 	if (rb_scan_args(argc, argv, "01", &rev) == 1) {
+ 		StringValue(rev);
+-		revstr = RSTRING(rev)->ptr;
++		revstr = RSTRING_PTR(rev);
+ 	}
+ 	data = rcscheckout(rb_rf->rf, revstr, &len);
+ 	if (data == NULL)
+@@ -332,7 +332,7 @@
+ 
+ 	if (rb_scan_args(argc, argv, "01", &sym) == 1) {
+ 		StringValue(sym);
+-		symstr = RSTRING(sym)->ptr;
++		symstr = RSTRING_PTR(sym);
+ 	}
+ 	rev = rcsrevfromsym(rb_rf->rf, symstr);
+ 	if (rev == NULL)
+@@ -350,7 +350,7 @@
+ 	char *data;
+ 
+ 	StringValue(rev);
+-	data = rcsgetlog(rb_rf->rf, RSTRING(rev)->ptr);
++	data = rcsgetlog(rb_rf->rf, RSTRING_PTR(rev));
+ 	if (data == NULL)
+ 		return Qnil;
+ 	ret = rb_tainted_str_new2(data);
+@@ -378,8 +378,8 @@
+ 
+ 	StringValue(index);
+ 	s.rev = &st;
+-	st.str = RSTRING(index)->ptr;
+-	st.len = RSTRING(index)->len;
++	st.str = RSTRING_PTR(index);
++	st.len = RSTRING_LEN(index);
+ 	f = RB_FIND(rcsrevtree, rb_rcsfile_revs(self), &s);
+ 	if (f == NULL)
+ 		return Qnil;
+@@ -466,8 +466,8 @@
+ 
+ 	StringValue(index);
+ 	s.rev = &st;
+-	st.str = RSTRING(index)->ptr;
+-	st.len = RSTRING(index)->len;
++	st.str = RSTRING_PTR(index);
++	st.len = RSTRING_LEN(index);
+ 	f = RB_FIND(rcsrevtree, rb_rcsfile_revs(self), &s);
+ 	if (f == NULL)
+ 		return Qfalse;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rcsparse/rcsparse.spec?r1=1.8&r2=1.9&f=u