[packages/ruby-fcgi] install to vendor dir

glen glen at pld-linux.org
Thu Dec 19 22:28:24 CET 2013


commit 1674b24c42329ff2fb87a44329b6907bb1cb3edb
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Dec 19 23:28:21 2013 +0200

    install to vendor dir

 ruby-fcgi.spec | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/ruby-fcgi.spec b/ruby-fcgi.spec
index a238803..48a50a1 100644
--- a/ruby-fcgi.spec
+++ b/ruby-fcgi.spec
@@ -11,10 +11,10 @@ Source0:	http://www.moonwolf.com/ruby/archive/%{name}-%{version}.tar.gz
 Patch0:		%{name}-ruby1.9.patch
 URL:		http://sugi.nemui.org/prod/ruby-fcgi/
 BuildRequires:	fcgi-devel
-BuildRequires:	rpmbuild(macros) >= 1.277
+BuildRequires:	rpm-rubyprov
+BuildRequires:	rpmbuild(macros) >= 1.665
 BuildRequires:	ruby-devel >= 1:1.8.4
 Obsoletes:	ruby-fcgi-minero
-%{?ruby_mod_ver_requires_eq}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,18 +53,19 @@ Dokumentacji w formacie ri dla %{name}.
 
 %build
 ruby install.rb config \
-	--site-ruby=%{ruby_rubylibdir} \
-	--so-dir=%{ruby_archdir}
+	--site-ruby=%{ruby_vendorlibdir} \
+	--so-dir=%{ruby_vendorarchdir}
 
 ruby install.rb setup
 
 rdoc --ri --op ri lib ext
 rdoc --op rdoc lib ext
 rm ri/created.rid
+rm ri/cache.ri
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}}
+install -d $RPM_BUILD_ROOT{%{ruby_ridir},%{ruby_rdocdir}}
 
 ruby install.rb install \
 	--prefix=$RPM_BUILD_ROOT
@@ -77,8 +78,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{ruby_rubylibdir}/fcgi.rb
-%attr(755,root,root) %{ruby_archdir}/fcgi.so
+%attr(755,root,root) %{ruby_vendorarchdir}/fcgi.so
+%{ruby_vendorlibdir}/fcgi.rb
 
 %files rdoc
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-fcgi.git/commitdiff/1674b24c42329ff2fb87a44329b6907bb1cb3edb



More information about the pld-cvs-commit mailing list