rpms/rubygems/EL-5 no-rdoc.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rubygems.spec, 1.3, 1.4 sources, 1.4, 1.5

[David Lutterkort (lutter)]

Author: lutter

Update of /cvs/extras/rpms/rubygems/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30554

Modified Files:
	.cvsignore rubygems.spec sources 
Added Files:
	no-rdoc.patch 
Log Message:
Version 0.9.4

no-rdoc.patch:

--- NEW FILE no-rdoc.patch ---
--- rubygems-0.9.1/post-install.rb.orig	2007-01-15 16:31:27.000000000 -0800
+++ rubygems-0.9.1/post-install.rb	2007-02-26 12:13:54.000000000 -0800
@@ -115,7 +115,6 @@
 
 install_sources
 remove_old_rdoc
-install_rdoc
 install_windows_batch_files
 remove_stubs
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygems/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Feb 2007 00:58:24 -0000	1.4
+++ .cvsignore	14 Sep 2007 19:41:57 -0000	1.5
@@ -1 +1 @@
-rubygems-0.9.2.tgz
+rubygems-0.9.4.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygems/EL-5/rubygems.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rubygems.spec	28 Feb 2007 00:58:24 -0000	1.3
+++ rubygems.spec	14 Sep 2007 19:41:57 -0000	1.4
@@ -3,20 +3,35 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
+%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_noarch %has_ruby_abi
+# Whether rdoc is in ruby-rdoc or in the main ruby package
+%define has_ruby_rdoc %has_ruby_abi
+# rdoc on RHEL4 has a bug that makes rdoc generation for rubygems fail
+%define suppress_rdoc 0%{?rhel:%rhel} == 4
+
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 0.9.2
+Version: 0.9.4
 Release: 1%{?dist}
 Group: Development/Libraries
 License: Ruby License/GPL
 URL: http://rubyforge.org/projects/rubygems/
-Source0: http://rubyforge.org/frs/download.php/17190/rubygems-0.9.2.tgz
+Source0: http://rubyforge.org/frs/download.php/20989/rubygems-0.9.4.tgz
 Patch0: noarch-gemdir.patch
+Patch1: no-rdoc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+%if %has_ruby_abi
 Requires: ruby(abi) = 1.8
+%endif
+BuildRequires: ruby
+%if %has_ruby_rdoc
 Requires: ruby-rdoc
-BuildRequires: ruby ruby-rdoc
+BuildRequires:  ruby-rdoc
+%endif
+%if %has_ruby_noarch
 BuildArch: noarch
+%endif
 Provides: ruby(rubygems) = %{version}
 
 %description
@@ -26,6 +41,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%if %suppress_rdoc
+%patch1 -p1
+%endif
+
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
 for f in `find lib -name \*.rb` ; do
@@ -68,6 +87,9 @@
 %{ruby_sitelib}/rbconfig/datadir.rb
 
 %changelog
+* Fri Jul 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.4-1
+- Conditionalize so it builds on RHEL4
+
 * Tue Feb 27 2007 David Lutterkort <dlutter at redhat.com> - 0.9.2-1
 - New version
 - Add patch0 to fix multilib sensitivity of Gem::dir (bz 227400)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygems/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Feb 2007 00:58:24 -0000	1.4
+++ sources	14 Sep 2007 19:41:57 -0000	1.5
@@ -1 +1 @@
-cc525053dd465ab6e33af382166fa808  rubygems-0.9.2.tgz
+b5680acaa019c80ea44fe87cc2e227da  rubygems-0.9.4.tgz