packages: ruby/ruby.spec - rel 5 - restore ruby_rdocdir

baggins baggins at pld-linux.org
Mon Mar 1 22:56:29 CET 2010


Author: baggins                      Date: Mon Mar  1 21:56:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- restore ruby_rdocdir

---- Files affected:
packages/ruby:
   ruby.spec (1.209 -> 1.210) 

---- Diffs:

================================================================
Index: packages/ruby/ruby.spec
diff -u packages/ruby/ruby.spec:1.209 packages/ruby/ruby.spec:1.210
--- packages/ruby/ruby.spec:1.209	Mon Mar  1 14:24:03 2010
+++ packages/ruby/ruby.spec	Mon Mar  1 22:56:23 2010
@@ -16,7 +16,7 @@
 Summary(zh_CN.UTF-8):	ruby - 一种快速高效的面向对象脚本编程语言
 Name:		ruby
 Version:	%{basever}.%{patchlevel}
-Release:	3
+Release:	5
 Epoch:		1
 License:	The Ruby License
 Group:		Development/Languages
@@ -31,6 +31,7 @@
 Source5:	%{name}-mode-init.el
 Patch0:		%{name}-mkmf-shared.patch
 Patch1:		%{name}-lib64.patch
+Patch2:		%{name}-archhdrdir.patch
 URL:		http://www.ruby-lang.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -203,6 +204,7 @@
 %setup -q -n %{name}-%{basever}-p%{patchlevel} -a1 -a2
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -228,7 +230,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install -d $RPM_BUILD_ROOT{%{ruby_rdocdir},%{_examplesdir}/%{name}-%{version}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -282,6 +284,7 @@
 %dir %{_datadir}/ri
 %dir %{_datadir}/ri/%{ruby_ver}
 %dir %{_datadir}/ri/%{ruby_ver}/system
+%dir %{ruby_rdocdir}
 
 %files devel
 %defattr(644,root,root,755)
@@ -394,6 +397,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.210  2010/03/01 21:56:23  baggins
+- rel 5
+- restore ruby_rdocdir
+
 Revision 1.209  2010/03/01 13:24:03  baggins
 - rel 3
 
================================================================

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



More information about the pld-cvs-commit mailing list