packages: ruby-builder/ruby-builder.spec - updated build process

baggins baggins at pld-linux.org
Sun Feb 28 19:36:02 CET 2010


Author: baggins                      Date: Sun Feb 28 18:36:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated build process

---- Files affected:
packages/ruby-builder:
   ruby-builder.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/ruby-builder/ruby-builder.spec
diff -u packages/ruby-builder/ruby-builder.spec:1.10 packages/ruby-builder/ruby-builder.spec:1.11
--- packages/ruby-builder/ruby-builder.spec:1.10	Sun Feb 28 19:33:29 2010
+++ packages/ruby-builder/ruby-builder.spec	Sun Feb 28 19:35:57 2010
@@ -9,9 +9,7 @@
 Source0:	http://rubyforge.org/frs/download.php/21725/builder-%{version}.tgz
 # Source0-md5:	31e6ecd35af1659272659610a51a8211
 URL:		http://rubyforge.org/projects/builder
-BuildRequires:	rake
 BuildRequires:	rpmbuild(macros) >= 1.277
-BuildRequires:	setup.rb >= 3.3.1
 %{?ruby_mod_ver_requires_eq}
 #BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,27 +40,16 @@
 %setup -q -n builder-%{version}
 
 %build
-cp /usr/share/setup.rb .
-ruby setup.rb config \
-	--rbdir=%{ruby_rubylibdir} \
-	--sodir=%{ruby_archdir}
-
-ruby setup.rb setup
-
 rdoc --op rdoc lib
-# /usr/lib/ruby/1.8/rdoc/markup/simple_markup/to_flow.rb:181:
-#in `convert_special': Unhandled special: Special: type=17, text="<!-- HI -->" (RuntimeError)
-#rdoc --ri --op ri lib
+rdoc --ri --op ri lib
 rm -f ri/created.rid
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}}
 
-ruby setup.rb install \
-	--prefix=$RPM_BUILD_ROOT
-
-#cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
+cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
 
 %clean
@@ -77,6 +64,7 @@
 %files rdoc
 %defattr(644,root,root,755)
 %{ruby_rdocdir}/%{name}-%{version}
+%{ruby_ridir}/Builder
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -84,6 +72,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2010/02/28 18:35:57  baggins
+- updated build process
+
 Revision 1.10  2010/02/28 18:33:29  baggins
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-builder/ruby-builder.spec?r1=1.10&r2=1.11&f=u



More information about the pld-cvs-commit mailing list