SPECS: ruby.spec - package %ruby_rdocdir - use postshell for scriptlets - r...

[glen]

Author: glen                         Date: Sun Oct 12 10:49:25 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- package %ruby_rdocdir
- use postshell for scriptlets
- rel 4

---- Files affected:
SPECS:
   ruby.spec (1.179 -> 1.180) 

---- Diffs:

================================================================
Index: SPECS/ruby.spec
diff -u SPECS/ruby.spec:1.179 SPECS/ruby.spec:1.180
--- SPECS/ruby.spec:1.179	Wed Oct  1 15:47:37 2008
+++ SPECS/ruby.spec	Sun Oct 12 12:49:20 2008
@@ -13,6 +13,7 @@
 #
 %define		ruby_ver	1.8
 %define		ruby_ridir	%{_datadir}/ri/%{ruby_ver}/system
+%define		ruby_rdocdir	%{_datadir}/rdoc
 Summary:	Ruby - interpreted scripting language
 Summary(ja.UTF-8):	オブジェクト指向言語Rubyインタプリタ
 Summary(pl.UTF-8):	Ruby - interpretowany język skryptowy
@@ -20,7 +21,7 @@
 Summary(zh_CN.UTF-8):	ruby - 一种快速高效的面向对象脚本编程语言
 Name:		ruby
 Version:	1.8.7
-Release:	3
+Release:	4
 Epoch:		1
 License:	The Ruby License
 Group:		Development/Languages
@@ -225,7 +226,7 @@
 %patch2 -p1
 %patch3 -p1
 
-find . -name '*.rb' -o -name '*.cgi' -o -name '*.test' -o -name 'ruby.1' \
+find -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}/,'
 
@@ -253,7 +254,7 @@
 %if %{with doc}
 mkdir rdoc
 
-RUBYLIB=".:lib:`find ext/ .ext/ -type d | tr '\n' ':'`"
+RUBYLIB=".:lib:$(find ext .ext -type d | tr '\n' ':')"
 export RUBYLIB
 LD_LIBRARY_PATH=$(pwd)
 export LD_LIBRARY_PATH
@@ -313,7 +314,7 @@
 install 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
-cat << EOF > path.el
+cat << 'EOF' > path.el
 (setq load-path (cons "." load-path) byte-compile-warnings nil)
 EOF
 emacs --no-site-file -q -batch -l path.el -f batch-byte-compile $RPM_BUILD_ROOT%{_emacs_lispdir}/%{name}-mode/*.el
@@ -323,12 +324,12 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
+%post	-p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 /sbin/ldconfig
 
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
+%postun	-p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 /sbin/ldconfig
 
 %files
@@ -352,6 +353,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)
@@ -461,6 +463,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.180  2008/10/12 10:49:20  glen
+- package %ruby_rdocdir
+- use postshell for scriptlets
+- rel 4
+
 Revision 1.179  2008/10/01 13:47:37  twittner
 - patch (-require-rubygems-version.patch) ruby againts an error:
   /usr/lib/ruby/1.8/rdoc/ri/ri_paths.rb:62: uninitialized constant Gem::Version (NameError)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ruby.spec?r1=1.179&r2=1.180&f=u