rpms/ruby/FC-6 .cvsignore, 1.18, 1.19 ruby.spec, 1.90, 1.91 sources, 1.17, 1.18
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Mar 19 07:50:57 UTC 2007
Author: tagoh
Update of /cvs/dist/rpms/ruby/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv23356
Modified Files:
.cvsignore ruby.spec sources
Log Message:
* Mon Mar 19 2007 Akira TAGOH <tagoh at redhat.com> - 1.8.5.35-1
- New upstream release.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-6/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 5 Feb 2007 11:37:20 -0000 1.18
+++ .cvsignore 19 Mar 2007 07:50:55 -0000 1.19
@@ -12,3 +12,4 @@
ruby-1.8.5.tar.gz
ruby-1.8.5-p2.tar.gz
ruby-1.8.5-p12.tar.gz
+ruby-1.8.5-p35.tar.gz
Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-6/ruby.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- ruby.spec 5 Feb 2007 11:35:20 -0000 1.90
+++ ruby.spec 19 Mar 2007 07:50:55 -0000 1.91
@@ -1,10 +1,12 @@
%define manver 1.4.6
%define rubyxver 1.8
%define rubyver 1.8.5
-%define _patchlevel 12
+%define _patchlevel 35
%define dotpatchlevel %{?_patchlevel:.%{_patchlevel}}
%define patchlevel %{?_patchlevel:-p%{_patchlevel}}
%define sitedir %{_libdir}/ruby/site_ruby
+# This is required to ensure that noarch files puts under /usr/lib/... for
+# multilib because ruby library is installed under /usr/{lib,lib64}/ruby anyway.
%define sitedir2 %{_prefix}/lib/ruby/site_ruby
Name: ruby
@@ -49,18 +51,18 @@
%package libs
-Summary: Libraries necessary to run Ruby.
+Summary: Libraries necessary to run Ruby
Group: Development/Libraries
Provides: ruby(abi) = %{rubyxver}
-Provides: libruby
-Obsoletes: libruby
+Provides: libruby = %{version}-%{release}
+Obsoletes: libruby <= %{version}-%{release}
%description libs
This package includes the libruby, necessary to run Ruby.
%package devel
-Summary: A Ruby development environment.
+Summary: A Ruby development environment
Group: Development/Languages
Requires: %{name}-libs = %{version}-%{release}
@@ -70,7 +72,7 @@
%package tcltk
-Summary: Tcl/Tk interface for scripting language Ruby.
+Summary: Tcl/Tk interface for scripting language Ruby
Group: Development/Languages
Requires: %{name}-libs = %{version}-%{release}
@@ -79,11 +81,11 @@
%package irb
-Summary: The Interactive Ruby.
+Summary: The Interactive Ruby
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
-Provides: irb
-Obsoletes: irb
+Provides: irb = %{version}-%{release}
+Obsoletes: irb <= %{version}-%{release}
%description irb
The irb is acronym for Interactive Ruby. It evaluates ruby expression
@@ -95,8 +97,8 @@
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: %{name}-irb = %{version}-%{release}
-Provides: rdoc
-Obsoletes: rdoc
+Provides: rdoc = %{version}-%{release}
+Obsoletes: rdoc <= %{version}-%{release}
%description rdoc
The rdoc is a tool to generate the documentation from Ruby source files.
@@ -105,7 +107,7 @@
%package docs
-Summary: Manuals and FAQs for scripting language Ruby.
+Summary: Manuals and FAQs for scripting language Ruby
Group: Documentation
%description docs
@@ -128,8 +130,8 @@
Group: Documentation
Requires: %{name} = %{version}-%{release}
Requires: %{name}-rdoc = %{version}-%{release}
-Provides: ri
-Obsoletes: ri
+Provides: ri = %{version}-%{release}
+Obsoletes: ri <= %{version}-%{release}
%description ri
ri is a command line tool that displays descriptions of built-in
@@ -194,10 +196,14 @@
rm -f parse.o
make OPT=-O0 RUBY_INSTALL_NAME=ruby %{?_smp_mflags}
%endif
+
+popd
+
+%check
+pushd %{name}-%{rubyver}%{?patchlevel}
%ifnarch ppc64
make test
%endif
-
popd
%install
@@ -309,7 +315,7 @@
%endif
# XXX: installing irb
-install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/
+install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/
%ifnarch ppc64
# installing ruby-mode
@@ -336,12 +342,14 @@
-e "s,\(/man/man./.*\)$,\1*," > ruby-all.files
egrep '(\.[ah]|libruby\.so)$' ruby-all.files > ruby-devel.files
+_rubytmpfile=`mktemp -t %{name}-%{version}-%{release}-tmp-%(%{__id_u -n}).XXXXXXXXXX`
# for ruby-tcltk.rpm
cp /dev/null ruby-tcltk.files
for f in `find %{name}-%{rubyver}%{?patchlevel}/ext/tk/lib -type f; find %{name}-%{rubyver}%{?patchlevel}/.ext -type f -name '*.so'; find %{name}-%{rubyver}%{?patchlevel}/ext/tk -type f -name '*.so'`
do
egrep "tcl|tk" ruby-all.files | grep "/`basename $f`$" >> ruby-tcltk.files || :
done
+sort ruby-tcltk.files | uniq - $_rubytmpfile && mv $_rubytmpfile ruby-tcltk.files
# for irb.rpm
fgrep 'irb' ruby-all.files > irb.files
@@ -388,19 +396,17 @@
rm -f *.files
rm -rf tmp-ruby-docs
-%post libs
-/sbin/ldconfig
+%post libs -p /sbin/ldconfig
-%postun libs
-/sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files -f ruby.files
%defattr(-, root, root)
-%doc %{name}-%{rubyver}%{?patchlevel}/README
-%lang(ja) %doc %{name}-%{rubyver}%{?patchlevel}/README.ja
%doc %{name}-%{rubyver}%{?patchlevel}/COPYING*
%doc %{name}-%{rubyver}%{?patchlevel}/ChangeLog
%doc %{name}-%{rubyver}%{?patchlevel}/LEGAL
+%doc %{name}-%{rubyver}%{?patchlevel}/README
+%lang(ja) %doc %{name}-%{rubyver}%{?patchlevel}/README.ja
%doc %{name}-%{rubyver}%{?patchlevel}/ToDo
%doc %{name}-%{rubyver}%{?patchlevel}/doc/NEWS
%doc tmp-ruby-docs/ruby/*
@@ -461,6 +467,9 @@
%endif
%changelog
+* Mon Mar 19 2007 Akira TAGOH <tagoh at redhat.com> - 1.8.5.35-1
+- New upstream release.
+
* Mon Feb 5 2007 Akira TAGOH <tagoh at redhat.com> - 1.8.5.12-1
- New upstream release.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-6/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 5 Feb 2007 11:37:20 -0000 1.17
+++ sources 19 Mar 2007 07:50:55 -0000 1.18
@@ -2,4 +2,4 @@
d65e3a216d6d345a2a6f1aa8758c2f75 ruby-refm-rdp-1.8.1-ja-html.tar.gz
7f3e181c0be9a1579e43a5a8b26372d6 rubyfaq-990927.tar.bz2
8aa2e2da327dc43ff6e46e634eb657b6 rubyfaq-jp-990927.tar.bz2
-d7d12dd9124c9b7d55cdbbee313e3931 ruby-1.8.5-p12.tar.gz
+fe413bf114e16b0cd596d869743e9d35 ruby-1.8.5-p35.tar.gz
More information about the fedora-cvs-commits
mailing list