rpms/ruby
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix cherry-pickup conflict

Browse Source
This commit is contained in:
Mamoru Tasaka 2012-10-04 21:51:59 +09:00
parent c933d86054
commit 44d26c808a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruby.spec
View File

@ -56,7 +56,7 @@ Version: %{ruby_version_patch_level}
# we cannot reset the release number to 1 even when the main (ruby) version # we cannot reset the release number to 1 even when the main (ruby) version
# is updated - because it may be that the versions of sub-components don't # is updated - because it may be that the versions of sub-components don't
# change. # change.
Release: 16%{?dist} Release: 17%{?dist}
Group: Development/Languages Group: Development/Languages
# Public Domain for example for: include/ruby/st.h, strftime.c, ... # Public Domain for example for: include/ruby/st.h, strftime.c, ...
License: (Ruby or BSD) and Public Domain License: (Ruby or BSD) and Public Domain
@ -89,6 +89,9 @@ Patch8: ruby-1.9.3-custom-rubygems-location.patch
# Add support for installing binary extensions according to FHS. # Add support for installing binary extensions according to FHS.
# https://github.com/rubygems/rubygems/issues/210 # https://github.com/rubygems/rubygems/issues/210
Patch9: rubygems-1.8.11-binary-extensions.patch Patch9: rubygems-1.8.11-binary-extensions.patch
# Patch from trunk for CVE-4464, CVE-4466
# http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=37068
Patch10: ruby-1.9.3-backport-from-trunk-rev37068.patch
# Make mkmf verbose by default # Make mkmf verbose by default
Patch12: ruby-1.9.3-mkmf-verbose.patch Patch12: ruby-1.9.3-mkmf-verbose.patch
@ -331,6 +334,7 @@ Tcl/Tk interface for the object-oriented scripting language Ruby.
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p0
%patch12 -p1 %patch12 -p1
%build %build
@ -506,6 +510,8 @@ make check TESTS="-v $DISABLE_TESTS"
%doc LEGAL %doc LEGAL
%doc README %doc README
%lang(ja) %doc README.ja %lang(ja) %doc README.ja
%doc NEWS
%doc doc/NEWS-*
# Exclude /usr/local directory since it is supposed to be managed by # Exclude /usr/local directory since it is supposed to be managed by
# local system administrator. # local system administrator.
%exclude %{ruby_sitelibdir} %exclude %{ruby_sitelibdir}
@ -696,12 +702,10 @@ make check TESTS="-v $DISABLE_TESTS"
%{_mandir}/man1/ri* %{_mandir}/man1/ri*
%files doc %files doc
%doc NEWS
%doc README %doc README
%lang(ja) %doc README.ja %lang(ja) %doc README.ja
%doc ChangeLog %doc ChangeLog
%doc doc/ChangeLog-* %doc doc/ChangeLog-*
%doc doc/NEWS-*
%{_datadir}/ri %{_datadir}/ri
%files -n rubygem-bigdecimal %files -n rubygem-bigdecimal
@ -737,6 +741,9 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib %{ruby_libdir}/tkextlib
%changelog %changelog
* Thu Oct 04 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.9.3.194-17
- Patch from trunk for CVE-2012-4464, CVE-2012-4466
* Thu Sep 06 2012 Vít Ondruch <vondruch@redhat.com> - 1.9.3.194-16 * Thu Sep 06 2012 Vít Ondruch <vondruch@redhat.com> - 1.9.3.194-16
- Split documentation into -doc subpackage (rhbz#854418). - Split documentation into -doc subpackage (rhbz#854418).