rpms/ruby/F-12 .cvsignore, 1.33, 1.34 import.log, 1.6, 1.7 ruby.spec, 1.145, 1.146 sources, 1.32, 1.33 noautobuild, 1.1, NONE ruby-1.8.6.x-CVE-2009-4492.patch, 1.1, NONE

[Jeroen van Meeuwen]

Author: kanarip

Update of /cvs/pkgs/rpms/ruby/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16712/F-12

Modified Files:
	.cvsignore import.log ruby.spec sources 
Removed Files:
	noautobuild ruby-1.8.6.x-CVE-2009-4492.patch 
Log Message:
1.8.6.388-6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-12/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	23 Oct 2009 17:25:53 -0000	1.33
+++ .cvsignore	21 Jan 2010 00:15:02 -0000	1.34
@@ -1,4 +1,4 @@
 ruby-refm-rdp-1.8.2-ja-html.tar.gz
 rubyfaq-990927.tar.gz
 rubyfaq-jp-990927.tar.gz
-ruby-1.8.6-p383.tar.bz2
+ruby-1.8.6-p388.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-12/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	23 Jun 2009 12:39:02 -0000	1.6
+++ import.log	21 Jan 2010 00:15:02 -0000	1.7
@@ -4,3 +4,4 @@ ruby-1_8_6_287-7_fc11:HEAD:ruby-1.8.6.28
 ruby-1_8_6_368-1_fc11:HEAD:ruby-1.8.6.368-1.fc11.src.rpm:1243759307
 ruby-1_8_6_368-2_fc11:HEAD:ruby-1.8.6.368-2.fc11.src.rpm:1245520186
 ruby-1_8_6_369-1_fc11:HEAD:ruby-1.8.6.369-1.fc11.src.rpm:1245760717
+ruby-1_8_6_388-6_fc12:F-12:ruby-1.8.6.388-6.fc12.src.rpm:1264032835


Index: ruby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-12/ruby.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- ruby.spec	12 Jan 2010 19:02:41 -0000	1.145
+++ ruby.spec	21 Jan 2010 00:15:02 -0000	1.146
@@ -1,6 +1,6 @@
 %define	rubyxver	1.8
 %define	rubyver		1.8.6
-%define _patchlevel	383
+%define _patchlevel	388
 %define dotpatchlevel	%{?_patchlevel:.%{_patchlevel}}
 %define patchlevel	%{?_patchlevel:-p%{_patchlevel}}
 %define	arcver		%{rubyver}%{?patchlevel}
@@ -20,7 +20,7 @@ Release:	6%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?fedora} >= 12
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 BuildRequires:  compat-readline5-devel
 %else
 BuildRequires:	readline readline-devel
@@ -56,8 +56,6 @@ Patch31:	ruby-1.8.6-p369-ri-gem_multipat
 # Patch32 from ruby_1_8 branch
 Patch32:	ruby-1.8head-irb-save-history.patch
 Patch33:	ruby-1.8.6-p383-mkmf-use-shared.patch
-# Patch34 already applied in 1.8.6p388
-Patch34:	ruby-1.8.6.x-CVE-2009-4492.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -199,7 +197,6 @@ pushd %{name}-%{arcver}
 %patch31 -p1
 %patch32 -p0
 %patch33 -p1
-%patch34 -p0
 popd
 
 %build
@@ -224,7 +221,7 @@ export CFLAGS
   --enable-pthread \
   --with-lookup-order-hack=INET \
   --disable-rpath \
-%if 0%{?fedora} >= 12
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
   --with-readline-include=%{_includedir}/readline5 \
   --with-readline-lib=%{_libdir}/readline5 \
 %endif
@@ -575,6 +572,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Mon Jan 18 2010 Akira TAGOH <tagoh at redhat.com>
+- Add conditional for RHEL.
+
 * Wed Jan 13 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.8.6.383-6
 - CVE-2009-4492 ruby WEBrick log escape sequence (bug 554485)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby/F-12/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	23 Oct 2009 17:25:53 -0000	1.32
+++ sources	21 Jan 2010 00:15:02 -0000	1.33
@@ -1,4 +1,4 @@
 b6dd396f513efeb7864685c840f9643a  ruby-refm-rdp-1.8.2-ja-html.tar.gz
 634c25b14e19925d10af3720d72e8741  rubyfaq-990927.tar.gz
 4fcec898f51d8371cc42d0a013940469  rubyfaq-jp-990927.tar.gz
-a48703cd982b9f0e3002700a50b0e88e  ruby-1.8.6-p383.tar.bz2
+f26cefbc8ab6728650ab9ae773d22bcb  ruby-1.8.6-p388.tar.bz2


--- noautobuild DELETED ---


--- ruby-1.8.6.x-CVE-2009-4492.patch DELETED ---