packages: mysql-ruby/mysql-ruby-amd64.patch, mysql-ruby/mysql-ruby.spec - u...
baggins
baggins at pld-linux.org
Tue Mar 9 12:55:35 CET 2010
Author: baggins Date: Tue Mar 9 11:55:35 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.8.2
- added rdoc and ri packages
---- Files affected:
packages/mysql-ruby:
mysql-ruby-amd64.patch (1.1 -> 1.2) , mysql-ruby.spec (1.24 -> 1.25)
---- Diffs:
================================================================
Index: packages/mysql-ruby/mysql-ruby-amd64.patch
diff -u packages/mysql-ruby/mysql-ruby-amd64.patch:1.1 packages/mysql-ruby/mysql-ruby-amd64.patch:1.2
--- packages/mysql-ruby/mysql-ruby-amd64.patch:1.1 Tue Sep 27 02:28:18 2005
+++ packages/mysql-ruby/mysql-ruby-amd64.patch Tue Mar 9 12:55:29 2010
@@ -1,30 +1,24 @@
-Index: mysql.c.in
+Index: mysql.c
===================================================================
---- mysql.c.in.orig
-+++ mysql.c.in
+--- mysql.c.orig
++++ mysql.c
@@ -1362,6 +1362,7 @@ static VALUE stmt_execute(int argc, VALU
- t.day = FIX2INT(RARRAY(a)->ptr[3]);
- t.month = FIX2INT(RARRAY(a)->ptr[4]);
- t.year = FIX2INT(RARRAY(a)->ptr[5]);
-+ t.time_type = MYSQL_TYPE_DATETIME;
- *(MYSQL_TIME*)&(s->param.buffer[i]) = t;
- } else if (CLASS_OF(argv[i]) == cMysqlTime) {
- MYSQL_TIME t;
+ t.day = FIX2INT(RARRAY_PTR(a)[3]);
+ t.month = FIX2INT(RARRAY_PTR(a)[4]);
+ t.year = FIX2INT(RARRAY_PTR(a)[5]);
++ t.time_type = MYSQL_TYPE_DATETIME;
+ *(MYSQL_TIME*)&(s->param.buffer[i]) = t;
+ } else if (CLASS_OF(argv[i]) == cMysqlTime) {
+ MYSQL_TIME t;
@@ -1375,6 +1376,7 @@ static VALUE stmt_execute(int argc, VALU
- t.day = NUM2INT(rb_iv_get(argv[i], "day"));
- t.month = NUM2INT(rb_iv_get(argv[i], "month"));
- t.year = NUM2INT(rb_iv_get(argv[i], "year"));
-+ t.time_type = MYSQL_TYPE_DATETIME;
- *(MYSQL_TIME*)&(s->param.buffer[i]) = t;
- } else
- rb_raise(rb_eTypeError, "unsupported type: %d", TYPE(argv[i]));
-@@ -1700,31 +1702,32 @@ static VALUE time_initialize(int argc, V
- rb_iv_set(obj, "second", NILorFIXvalue(second));
- rb_iv_set(obj, "neg", (neg == Qnil || neg == Qfalse) ? Qfalse : Qtrue);
- rb_iv_set(obj, "second_part", NILorFIXvalue(second_part));
-+ return obj;
- }
-
+ t.day = NUM2INT(rb_iv_get(argv[i], "day"));
+ t.month = NUM2INT(rb_iv_get(argv[i], "month"));
+ t.year = NUM2INT(rb_iv_get(argv[i], "year"));
++ t.time_type = MYSQL_TYPE_DATETIME;
+ *(MYSQL_TIME*)&(s->param.buffer[i]) = t;
+ } else
+ rb_raise(rb_eTypeError, "unsupported type: %d", TYPE(argv[i]));
+@@ -1700,26 +1702,26 @@ static VALUE time_initialize(int argc, V
static VALUE time_inspect(VALUE obj)
{
char buf[36];
================================================================
Index: packages/mysql-ruby/mysql-ruby.spec
diff -u packages/mysql-ruby/mysql-ruby.spec:1.24 packages/mysql-ruby/mysql-ruby.spec:1.25
--- packages/mysql-ruby/mysql-ruby.spec:1.24 Sun Mar 16 22:43:15 2008
+++ packages/mysql-ruby/mysql-ruby.spec Tue Mar 9 12:55:29 2010
@@ -2,22 +2,21 @@
Summary: MySQL module for Ruby
Summary(pl.UTF-8): Moduł MySQL dla języka Ruby
Name: mysql-ruby
-Version: 2.7
-Release: 4
+Version: 2.8.2
+Release: 1
License: GPL
Group: Development/Languages
Source0: http://tmtm.org/downloads/mysql/ruby/%{name}-%{version}.tar.gz
-# Source0-md5: c6668900e68f0d6a137612c818d5fd01
+# Source0-md5: eb998b89b7e391cffe0a1f84bd426f9b
Patch0: %{name}-amd64.patch
URL: http://www.tmtm.org/mysql/ruby/
BuildRequires: mysql-devel
-BuildRequires: rpmbuild(macros) >= 1.277
-BuildRequires: ruby-devel
+BuildRequires: rpmbuild(macros) >= 1.484
+BuildRequires: ruby >= 1:1.8.6
+BuildRequires: ruby-modules
%{?ruby_mod_ver_requires_eq}
Provides: ruby-mysql-library
Obsoletes: ruby-Mysql
-# FIXME: obsolete or conflict, not both
-Obsoletes: ruby-mysql
Conflicts: ruby-mysql
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,40 +26,74 @@
%description -l pl.UTF-8
Moduł MySQL dla języka Ruby.
+%package rdoc
+Summary: HTML documentation for %{name}
+Summary(pl.UTF-8): Dokumentacja w formacie HTML dla %{name}
+Group: Documentation
+Requires: ruby >= 1:1.8.7-4
+
+%description rdoc
+HTML documentation for %{name}.
+
+%description rdoc -l pl.UTF-8
+Dokumentacja w formacie HTML dla %{name}.
+
+%package ri
+Summary: ri documentation for %{name}
+Summary(pl.UTF-8): Dokumentacja w formacie ri dla %{name}
+Group: Documentation
+Requires: ruby
+
+%description ri
+ri documentation for %{name}.
+
+%description ri -l pl.UTF-8
+Dokumentacji w formacie ri dla %{name}.
+
%prep
%setup -q
%patch0 -p0
%build
ruby extconf.rb \
- --with-mysql-dir=%{_prefix}
+ --with-mysql-config
+
%{__make} \
CC="%{__cc}" \
CFLAGS="%{rpmcflags} -fPIC"
-rdoc -o rdoc
-rdoc --ri -o ri
+rdoc --ri --op ri
+rdoc --op rdoc
+rm -r ri/Object
rm ri/created.rid
-rm ri/Object/cdesc-Object.yaml
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_archdir},%{ruby_ridir}}
+install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}}
%{__make} install \
archdir=$RPM_BUILD_ROOT%{ruby_archdir} \
sitearchdir=$RPM_BUILD_ROOT%{ruby_archdir}
cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README* rdoc
+%doc README*
%attr(755,root,root) %{ruby_archdir}/mysql.so
-%{ruby_ridir}/*
+
+%files rdoc
+%defattr(644,root,root,755)
+%{ruby_rdocdir}/%{name}-%{version}
+
+%files ri
+%defattr(644,root,root,755)
+%{ruby_ridir}/Mysql
+%{ruby_ridir}/TC_Mysql*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -68,6 +101,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.25 2010/03/09 11:55:29 baggins
+- up to 2.8.2
+- added rdoc and ri packages
+
Revision 1.24 2008/03/16 21:43:15 aredridel
- remove duplicate ri files
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-ruby/mysql-ruby-amd64.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-ruby/mysql-ruby.spec?r1=1.24&r2=1.25&f=u
More information about the pld-cvs-commit
mailing list