packages: ruby/ruby.spec, ruby/ruby-imap-quicksync-fix.patch (REMOVED) - up...

[glen]

Author: glen                         Date: Thu Jan 14 16:39:23 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.8.7.249

---- Files affected:
packages/ruby:
   ruby.spec (1.196 -> 1.197) , ruby-imap-quicksync-fix.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/ruby/ruby.spec
diff -u packages/ruby/ruby.spec:1.196 packages/ruby/ruby.spec:1.197
--- packages/ruby/ruby.spec:1.196	Tue Nov 17 14:29:23 2009
+++ packages/ruby/ruby.spec	Thu Jan 14 17:39:18 2010
@@ -10,7 +10,7 @@
 %define		ruby_ridir	%{_datadir}/ri/%{ruby_ver}/system
 %define		ruby_rdocdir	%{_datadir}/rdoc
 %define		stdlibdoc_version	0.10.1
-%define		patchlevel 174
+%define		patchlevel 249
 %define		basever 1.8.7
 Summary:	Ruby - interpreted scripting language
 Summary(ja.UTF-8):	オブジェクト指向言語Rubyインタプリタ
@@ -19,12 +19,12 @@
 Summary(zh_CN.UTF-8):	ruby - 一种快速高效的面向对象脚本编程语言
 Name:		ruby
 Version:	%{basever}.%{patchlevel}
-Release:	2
+Release:	1
 Epoch:		1
 License:	The Ruby License
 Group:		Development/Languages
 Source0:	ftp://ftp.ruby-lang.org/pub/ruby/%{name}-%{basever}-p%{patchlevel}.tar.bz2
-# Source0-md5:	88c45aaf627b4404e5e4273cb03ba2ee
+# Source0-md5:	37200cc956a16996bbfd25bb4068f242
 Source1:	http://www.ibiblio.org/pub/languages/ruby/doc/%{name}-texi-1.4-en.tar.gz
 # Source1-md5:	839fda4af52b5c5c6d21f879f7fc62bf
 Source2:	http://www.math.sci.hokudai.ac.jp/~gotoken/ruby/%{name}-uguide-981227.tar.gz
@@ -47,7 +47,6 @@
 Patch1:		%{name}-mkmf-shared.patch
 Patch2:		%{name}-require-rubygems-version.patch
 Patch3:		%{name}-lib64.patch
-Patch4:		%{name}-imap-quicksync-fix.patch
 URL:		http://www.ruby-lang.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -222,10 +221,9 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
-find -type f \( -name '*.rb' -o -name '*.cgi' -o -name '*.test' -o -name 'ruby.1' \
-	-o -name 'ruby.info*' -o -name '*.html' -o -name '*.tcl' -o -name '*.texi' \) \
+find -type f '(' -name '*.rb' -o -name '*.cgi' -o -name '*.test' -o -name 'ruby.1' \
+	-o -name 'ruby.info*' -o -name '*.html' -o -name '*.tcl' -o -name '*.texi' ')' \
 	| xargs %{__sed} -i 's,/usr/local/bin/,%{_bindir}/,'
 
 %build
@@ -294,12 +292,12 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 cp -Rf sample/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-install %{name}-texi-1.4-en/ruby.info* $RPM_BUILD_ROOT%{_infodir}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1
-install %{SOURCE8} $RPM_BUILD_ROOT%{_mandir}/man1
-install %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man1
-install %{SOURCE10} $RPM_BUILD_ROOT%{_mandir}/man1
-install %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a %{name}-texi-1.4-en/ruby.info* $RPM_BUILD_ROOT%{_infodir}
+cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a %{SOURCE10} $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1
 
 cp -Rf ruby-uguide guide
 cp -Rf rubyfaq faq
@@ -309,9 +307,9 @@
 # ruby emacs mode - borrowed from FC-4
 %if %{with emacs}
 install -d $RPM_BUILD_ROOT%{_emacs_lispdir}/{%{name}-mode,site-start.d}
-install misc/*.el $RPM_BUILD_ROOT%{_emacs_lispdir}/%{name}-mode
+cp -a misc/*.el $RPM_BUILD_ROOT%{_emacs_lispdir}/%{name}-mode
 rm -f $RPM_BUILD_ROOT%{_emacs_lispdir}/%{name}-mode/rubydb2x.el*
-install %{SOURCE12} $RPM_BUILD_ROOT%{_emacs_lispdir}/site-start.d
+install -p %{SOURCE12} $RPM_BUILD_ROOT%{_emacs_lispdir}/site-start.d
 cat << 'EOF' > path.el
 (setq load-path (cons "." load-path) byte-compile-warnings nil)
 EOF
@@ -461,6 +459,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.197  2010/01/14 16:39:18  glen
+- up to 1.8.7.249
+
 Revision 1.196  2009/11/17 13:29:23  glen
 - release 2
 
================================================================

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