rpms/rubygems/devel import.log, NONE, 1.1 rubygems-1.3.1-noarch-gemdir.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 rubygems.spec, 1.7, 1.8 sources, 1.6, 1.7 no-rdoc.patch, 1.1, NONE noarch-gemdir.patch, 1.2, NONE
Jeroen van Meeuwen
kanarip at fedoraproject.org
Sat Dec 13 12:50:45 UTC 2008
- Previous message (by thread): rpms/cups/devel cups.init,1.16,1.17 cups.spec,1.451,1.452
- Next message (by thread): rpms/rubygems/F-10 import.log, NONE, 1.1 rubygems-1.3.1-noarch-gemdir.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 rubygems.spec, 1.7, 1.8 sources, 1.6, 1.7 no-rdoc.patch, 1.1, NONE noarch-gemdir.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kanarip
Update of /cvs/pkgs/rpms/rubygems/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19063/devel
Modified Files:
.cvsignore rubygems.spec sources
Added Files:
import.log rubygems-1.3.1-noarch-gemdir.patch
Removed Files:
no-rdoc.patch noarch-gemdir.patch
Log Message:
1.3.1-1.fc9
--- NEW FILE import.log ---
rubygems-1_3_1-1_fc9:HEAD:rubygems-1.3.1-1.fc9.src.rpm:1229172588
rubygems-1.3.1-noarch-gemdir.patch:
--- NEW FILE rubygems-1.3.1-noarch-gemdir.patch ---
diff -ur rubygems-1.3.1.orig/lib/rubygems/defaults.rb rubygems-1.3.1/lib/rubygems/defaults.rb
--- rubygems-1.3.1.orig/lib/rubygems/defaults.rb 2008-10-10 22:29:53.000000000 +0200
+++ rubygems-1.3.1/lib/rubygems/defaults.rb 2008-11-09 01:02:33.000000000 +0100
@@ -21,8 +21,8 @@
File.join File.dirname(ConfigMap[:sitedir]), '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])
end
end
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 16 Sep 2008 23:09:08 -0000 1.6
+++ .cvsignore 13 Dec 2008 12:50:12 -0000 1.7
@@ -1 +1 @@
-rubygems-1.2.0.tgz
+rubygems-1.3.1.tgz
Index: rubygems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/devel/rubygems.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rubygems.spec 16 Sep 2008 23:24:37 -0000 1.7
+++ rubygems.spec 13 Dec 2008 12:50:12 -0000 1.8
@@ -5,14 +5,14 @@
Summary: The Ruby standard for packaging ruby libraries
Name: rubygems
-Version: 1.2.0
-Release: 2%{?dist}
+Version: 1.3.1
+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/38646/rubygems-1.2.0.tgz
-Patch0: noarch-gemdir.patch
+Source0: http://rubyforge.org/frs/download.php/45905/rubygems-1.3.1.tgz
+Patch0: rubygems-1.3.1-noarch-gemdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
Requires: ruby(abi) = 1.8 ruby-rdoc
BuildRequires: ruby ruby-rdoc
@@ -38,8 +38,15 @@
%install
rm -rf $RPM_BUILD_ROOT
-GEM_HOME=$RPM_BUILD_ROOT%{gem_home} \
- ruby setup.rb --destdir=$RPM_BUILD_ROOT
+GEM_HOME=%{buildroot}/%{gem_home} \
+ ruby setup.rb --prefix=%{_prefix} \
+ --no-rdoc --no-ri \
+ --destdir=%{buildroot}/%{ruby_sitelib}/
+
+mkdir -p %{buildroot}/%{_bindir}
+mv %{buildroot}/%{ruby_sitelib}/bin/gem %{buildroot}/%{_bindir}/gem
+rm -rf %{buildroot}/%{ruby_sitelib}/bin
+mv %{buildroot}/%{ruby_sitelib}/lib/* %{buildroot}/%{ruby_sitelib}/.
%clean
rm -rf $RPM_BUILD_ROOT
@@ -48,16 +55,19 @@
%defattr(-, root, root, -)
%doc README TODO ChangeLog
%doc GPL.txt LICENSE.txt
+%dir %{gem_dir}
+%dir %{gem_home}
+%dir %{gem_home}/cache
+%dir %{gem_home}/gems
+%dir %{gem_home}/specifications
+%doc %{gem_home}/doc
%{_bindir}/gem
-
-%{gem_dir}
-
-%{ruby_sitelib}/ubygems.rb
-%{ruby_sitelib}/rubygems.rb
-%{ruby_sitelib}/rubygems
-%{ruby_sitelib}/rbconfig
+%{ruby_sitelib}/*
%changelog
+* Sun Nov 09 2008 Jeroen van Meeuwen <kanarip at kanarip.com> - 1.3.1-1
+- New upstream version
+
* Tue Sep 16 2008 David Lutterkort <dlutter at redhat.com> - 1.2.0-2
- Bump release because I forgot to check in newer patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygems/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 16 Sep 2008 23:09:09 -0000 1.6
+++ sources 13 Dec 2008 12:50:12 -0000 1.7
@@ -1 +1 @@
-b77a4234360735174d1692e6fc598402 rubygems-1.2.0.tgz
+a04ee6f6897077c5b75f5fd1e134c5a9 rubygems-1.3.1.tgz
--- no-rdoc.patch DELETED ---
--- noarch-gemdir.patch DELETED ---
- Previous message (by thread): rpms/cups/devel cups.init,1.16,1.17 cups.spec,1.451,1.452
- Next message (by thread): rpms/rubygems/F-10 import.log, NONE, 1.1 rubygems-1.3.1-noarch-gemdir.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 rubygems.spec, 1.7, 1.8 sources, 1.6, 1.7 no-rdoc.patch, 1.1, NONE noarch-gemdir.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list