use updated setup.rb

[packages/ruby-fcgi.git] / ruby-fcgi.spec

diff --git a/ruby-fcgi.spec b/ruby-fcgi.spec
index a23880320e5c5c216dfaa1bd7f421c6a7fe404c8..4d4ec79013e6a254b682a71df6546fe35e4236dd 100644 (file)
--- a/ruby-fcgi.spec
+++ b/ruby-fcgi.spec
@@ -3,7 +3,7 @@ Summary:        Ruby FastCGI Library
 Summary(pl.UTF-8):     Biblioteka FastCGI dla języka Ruby
 Name:          ruby-fcgi
 Version:       0.8.7
-Release:       2
+Release:       8
 License:       GPL
 Group:         Development/Libraries
 Source0:       http://www.moonwolf.com/ruby/archive/%{name}-%{version}.tar.gz
@@ -11,10 +11,11 @@ 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
+BuildRequires: setup.rb >= 3.4.1-6
 Obsoletes:     ruby-fcgi-minero
-%{?ruby_mod_ver_requires_eq}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -28,6 +29,9 @@ Summary:      HTML documentation for %{name}
 Summary(pl.UTF-8):     Dokumentacja w formacie HTML dla %{name}
 Group:         Documentation
 Requires:      ruby >= 1:1.8.7-4
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description rdoc
 HTML documentation for %{name}.
@@ -40,6 +44,9 @@ Summary:      ri documentation for %{name}
 Summary(pl.UTF-8):     Dokumentacja w formacie ri dla %{name}
 Group:         Documentation
 Requires:      ruby
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description ri
 ri documentation for %{name}.
@@ -53,18 +60,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 +85,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)