[packages/ruby-yajl] cleanup, do not use setup.rb

glen glen at pld-linux.org
Sat Apr 27 12:52:05 CEST 2013


commit 2e7fd6d8d29fced7c09c894d4c72d4dd4afe541d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 27 13:51:57 2013 +0300

    cleanup, do not use setup.rb

 ruby-yajl.spec | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/ruby-yajl.spec b/ruby-yajl.spec
index 58f0cad..4b52898 100644
--- a/ruby-yajl.spec
+++ b/ruby-yajl.spec
@@ -2,16 +2,15 @@
 Summary:	Ruby C bindings to the excellent Yajl JSON stream-based parser library
 Name:		ruby-yajl
 Version:	1.1.0
-Release:	0.4
+Release:	1
 License:	MIT
 Group:		Development/Languages
-URL:		http://rdoc.info/github/brianmario/yajl-ruby
 Source0:	%{rbname}-%{version}.gem
 # Source0-md5:	5f35141b89be7da3b279b65ea0f3c0c2
+URL:		http://rdoc.info/github/brianmario/yajl-ruby
 BuildRequires:	rpm-rubyprov
 BuildRequires:	rpmbuild(macros) >= 1.656
 BuildRequires:	ruby-devel
-BuildRequires:	setup.rb
 Requires:	ruby-activesupport
 Requires:	ruby-json
 Requires:	ruby-rake-compiler >= 0.7.5
@@ -24,30 +23,19 @@ C binding to the excellent YAJL JSON parsing and generation library.
 %prep
 %setup -q
 
-# ext build
-cp -p %{_datadir}/setup.rb .
-
 %build
-ruby setup.rb config \
-	--prefix=%{_prefix} \
-	--siterubyver=%{ruby_vendorlibdir} \
-	--siterubyverarch=%{ruby_vendorarchdir} \
-
 cd ext/yajl
-# binary pkgs:
 %{__ruby} extconf.rb
-%{__make} \
+%{__make} V=1 \
 	CC="%{__cc}" \
 	LDFLAGS="%{rpmldflags}" \
 	CFLAGS="%{rpmcflags} -fPIC"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__ruby} setup.rb install \
-	--prefix=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{ruby_vendorarchdir}/yajl
-mv $RPM_BUILD_ROOT%{ruby_vendorarchdir}/{,yajl/}yajl.so
+install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_vendorarchdir}/yajl}
+cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
+install -p ext/yajl/yajl.so $RPM_BUILD_ROOT%{ruby_vendorarchdir}/yajl/yajl.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-yajl.git/commitdiff/2e7fd6d8d29fced7c09c894d4c72d4dd4afe541d



More information about the pld-cvs-commit mailing list