rpms/rubygems/devel .cvsignore, 1.5, 1.6 rubygems.spec, 1.5, 1.6 sources, 1.5, 1.6

[David Lutterkort]

Author: lutter

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

Modified Files:
	.cvsignore rubygems.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Sep 2007 21:57:59 -0000	1.5
+++ .cvsignore	16 Sep 2008 23:09:08 -0000	1.6
@@ -1 +1 @@
-rubygems-0.9.4.tgz
+rubygems-1.2.0.tgz


Index: rubygems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/devel/rubygems.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rubygems.spec	3 Sep 2008 21:28:44 -0000	1.5
+++ rubygems.spec	16 Sep 2008 23:09:09 -0000	1.6
@@ -3,48 +3,29 @@
 %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.4
-Release: 2%{?dist}
+Version: 1.2.0
+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/20989/rubygems-0.9.4.tgz
+Source0: http://rubyforge.org/frs/download.php/38646/rubygems-1.2.0.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-rdoc
-%endif
-%if %has_ruby_noarch
+Requires: ruby(abi) = 1.8 ruby-rdoc
+BuildRequires:  ruby ruby-rdoc
 BuildArch: noarch
-%endif
 Provides: ruby(rubygems) = %{version}
 
 %description
-RubyGems is the Ruby standard for publishing and managing third party 
+RubyGems is the Ruby standard for publishing and managing third party
 libraries.
 
 %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
@@ -53,41 +34,35 @@
 done
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" \
-ruby setup.rb config
-ruby setup.rb setup
-ruby doc/makedoc.rb
+# Nothing
 
 %install
 rm -rf $RPM_BUILD_ROOT
 GEM_HOME=$RPM_BUILD_ROOT%{gem_home} \
-    ruby setup.rb install --prefix=$RPM_BUILD_ROOT
+    ruby setup.rb --destdir=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%doc README TODO ChangeLog Releases gemspecs
+%doc README TODO ChangeLog
 %doc GPL.txt LICENSE.txt
 %{_bindir}/gem
-%{_bindir}/gemlock
-%{_bindir}/gem_mirror
-%{_bindir}/gemri
-%{_bindir}/gem_server
-%{_bindir}/gemwhich
-%{_bindir}/index_gem_repository.rb
-%{_bindir}/update_rubygems
 
 %{gem_dir}
 
-%{ruby_sitelib}/gemconfigure.rb
 %{ruby_sitelib}/ubygems.rb
 %{ruby_sitelib}/rubygems.rb
 %{ruby_sitelib}/rubygems
-%{ruby_sitelib}/rbconfig/datadir.rb
+%{ruby_sitelib}/rbconfig
 
 %changelog
+* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 1.2.0-1
+- Updated for new setup.rb
+- Simplified by removing conditionals that were needed for EL-4;
+  there's just no way we can support that with newer rubygems
+
 * Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.4-2
 - fix license tag
 
@@ -115,4 +90,4 @@
 - Updated for 0.8.11
 
 * Sun Oct 10 2004 Omar Kilani <omar at tinysofa.org> 0.8.1-1ts
-- First version of the package 
+- First version of the package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Sep 2007 21:57:59 -0000	1.5
+++ sources	16 Sep 2008 23:09:09 -0000	1.6
@@ -1 +1 @@
-b5680acaa019c80ea44fe87cc2e227da  rubygems-0.9.4.tgz
+b77a4234360735174d1692e6fc598402  rubygems-1.2.0.tgz