rpms/rubygems/devel rubygems-1.3.5-noarch-gemdir.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 rubygems.spec, 1.10, 1.11 sources, 1.7, 1.8 rubygems-1.3.1-noarch-gemdir.patch, 1.1, NONE

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/rubygems/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7435/rubygems/devel

Modified Files:
	.cvsignore rubygems.spec sources 
Added Files:
	rubygems-1.3.5-noarch-gemdir.patch 
Removed Files:
	rubygems-1.3.1-noarch-gemdir.patch 
Log Message:
rails 2.3.4 (CVE-2009-3009), requires rubygems >= 1.3.4

rubygems-1.3.5-noarch-gemdir.patch:
 defaults.rb |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE rubygems-1.3.5-noarch-gemdir.patch ---
--- rubygems-1.3.5/lib/rubygems/defaults.rb.noarch	2009-06-23 07:54:36.000000000 +0900
+++ rubygems-1.3.5/lib/rubygems/defaults.rb	2009-09-21 00:29:09.000000000 +0900
@@ -25,8 +25,10 @@
       File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems',
                 ConfigMap[:ruby_version])
     else
-      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
-                ConfigMap[:ruby_version])
+      gemdir = File::expand_path(File::join(ConfigMap[:sitedir],"..","gems"))
+      File.join(gemdir, ConfigMap[:ruby_version])
+#      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
+#                ConfigMap[:ruby_version])
     end
   end
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygems/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Dec 2008 12:50:12 -0000	1.7
+++ .cvsignore	20 Sep 2009 16:40:31 -0000	1.8
@@ -1 +1 @@
-rubygems-1.3.1.tgz
+rubygems-1.3.5.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygems/devel/rubygems.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- rubygems.spec	27 Jul 2009 03:38:26 -0000	1.10
+++ rubygems.spec	20 Sep 2009 16:40:31 -0000	1.11
@@ -3,16 +3,18 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
+%define repoid 60718
+
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 1.3.1
-Release: 3%{?dist}
+Version: 1.3.5
+Release: 1%{?dist}
 Group: Development/Libraries
 # No GPL version is specified.
 License: Ruby or GPL+
 URL: http://rubyforge.org/projects/rubygems/
-Source0: http://rubyforge.org/frs/download.php/45905/rubygems-1.3.1.tgz
-Patch0: rubygems-1.3.1-noarch-gemdir.patch
+Source0: http://rubyforge.org/frs/download.php/%{repoid}/rubygems-%{version}.tgz
+Patch0: rubygems-1.3.5-noarch-gemdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 Requires: ruby(abi) = 1.8 ruby-rdoc
 BuildRequires:  ruby ruby-rdoc
@@ -25,7 +27,7 @@ libraries.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .noarch
 
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
@@ -39,7 +41,7 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 GEM_HOME=%{buildroot}/%{gem_home} \
-    ruby setup.rb --prefix=%{_prefix} \
+    ruby setup.rb --prefix=/ \
         --no-rdoc --no-ri \
         --destdir=%{buildroot}/%{ruby_sitelib}/
 
@@ -53,7 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%doc README TODO ChangeLog
+%doc README ChangeLog
+%doc History.txt
 %doc GPL.txt LICENSE.txt
 %dir %{gem_dir}
 %dir %{gem_home}
@@ -65,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/*
 
 %changelog
+* Mon Sep 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.5-1
+- Update to 1.3.5
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygems/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Dec 2008 12:50:12 -0000	1.7
+++ sources	20 Sep 2009 16:40:31 -0000	1.8
@@ -1 +1 @@
-a04ee6f6897077c5b75f5fd1e134c5a9  rubygems-1.3.1.tgz
+6e317335898e73beab15623cdd5f8cff  rubygems-1.3.5.tgz


--- rubygems-1.3.1-noarch-gemdir.patch DELETED ---