SPECS: ruby-RubyGems.spec - unify ri/rdoc locations

glen glen at pld-linux.org
Tue Jan 6 09:04:04 CET 2009


Author: glen                         Date: Tue Jan  6 08:04:04 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify ri/rdoc locations

---- Files affected:
SPECS:
   ruby-RubyGems.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/ruby-RubyGems.spec
diff -u SPECS/ruby-RubyGems.spec:1.14 SPECS/ruby-RubyGems.spec:1.15
--- SPECS/ruby-RubyGems.spec:1.14	Fri Sep 12 18:50:06 2008
+++ SPECS/ruby-RubyGems.spec	Tue Jan  6 09:03:59 2009
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-%define		_name	%(echo %{name} | tr '[:upper:]' '[:lower:]')
 Summary:	Ruby package manager
 Summary(pl.UTF-8):	Zarządca pakietów dla języka Ruby
 Name:		ruby-RubyGems
@@ -11,14 +10,15 @@
 # Source0-md5:	b77a4234360735174d1692e6fc598402
 Patch0:		%{name}-setup.patch
 URL:		http://rubygems.org/
-#BuildRequires:	rpmbuild(macros) >= 1.410
+BuildRequires:	ruby >= 1:1.8.6
 BuildRequires:	ruby-devel
 BuildRequires:	sed >= 4.0
 %{?ruby_mod_ver_requires_eq}
 #BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_gemdir		%{_libdir}/ruby/gems/%{ruby_version}
+# nothing to be placed there. we're not noarch only because of ruby packaging
+%define		_enable_debug_packages	0
 
 %description
 RubyGems is the Ruby standard for publishing and managing third party
@@ -31,38 +31,53 @@
 %package ri
 Summary:	Ruby Gem package manager ri documentation
 Summary(pl.UTF-8):	Dokumentacja w formacie ri dla menadżera pakietów Ruby
-Group:	Documentation
+Group:		Documentation
+Requires:	ruby
 
 %description ri
 Ruby Gem package manager ri documentation.
 
 %description ri -l pl.UTF-8
-Dokumentacji w formacie ri dla menadżera pakietów Ruby. 
+Dokumentacji w formacie ri dla menadżera pakietów Ruby.
 
 %package rdoc
 Summary:	Ruby Gem package manager HTML documentation
 Summary(pl.UTF-8):	Dokumentacja w formacie HTML dla menadżera pakietów Ruby
-Group:	Documentation
+Group:		Documentation
+Requires:	ruby >= 1:1.8.7-4
 
 %description rdoc
 Ruby Gem package manager HTML documentation.
 
 %description rdoc -l pl.UTF-8
-Dokumentacja w formacie HTML dla menadżera pakietów Ruby. 
+Dokumentacja w formacie HTML dla menadżera pakietów Ruby.
 
 %prep
 %setup -q -n rubygems-%{version}
 %patch0 -p1
 
 %build
+rdoc --ri --op ri lib
+rdoc --op rdoc lib
+rm -f ri/created.rid
+
+# external packages?
+rm -rf ri/Config
+rm -rf ri/Kernel
+rm -rf ri/OpenSSL
+rm -rf ri/TempIO
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
+install -d $RPM_BUILD_ROOT{%{ruby_ridir},%{ruby_rdocdir}}
 ruby setup.rb \
 	--vendor \
-	--rdocdir=./rdoc \
-	--destdir="$RPM_BUILD_ROOT"
+	--no-rdoc \
+	--no-ri \
+	--destdir=$RPM_BUILD_ROOT
+
+cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,18 +99,14 @@
 %dir %{ruby_vendorlibdir}/rbconfig
 %{ruby_vendorlibdir}/rbconfig/datadir.rb
 %dir %{_libdir}/ruby/gems
-%dir %{_gemdir}
-%dir %{_gemdir}/doc
-%dir %{_gemdir}/doc/rubygems-%{version}
 
 %files ri
 %defattr(644,root,root,755)
-%dir %{_gemdir}/doc/rubygems-%{version}/ri
-%{_gemdir}/doc/rubygems-%{version}/ri/*
+%{ruby_ridir}/Gem
 
 %files rdoc
 %defattr(644,root,root,755)
-%doc rdoc/*
+%{ruby_rdocdir}/%{name}-%{version}
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -103,6 +114,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2009/01/06 08:03:59  glen
+- unify ri/rdoc locations
+
 Revision 1.14  2008/09/12 16:50:06  twittner
 - up to 1.2.0 (merged from DEVEL)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ruby-RubyGems.spec?r1=1.14&r2=1.15&f=u



More information about the pld-cvs-commit mailing list