install to vendor dir; noarch package

diff --git a/ruby-actionmailer.spec b/ruby-actionmailer.spec
index 9c9e7fa86ec7d10cf062b5d12faad35e17ba655c..a48e933c52b616cf5613114d4f0d56ba907dc685 100644 (file)
--- a/ruby-actionmailer.spec
+++ b/ruby-actionmailer.spec
@@ -3,26 +3,21 @@ Summary:      Mail generator library for Ruby
 Summary(pl.UTF-8):     Biblioteka do generowania listów w języku Ruby
 Name:          ruby-%{pkgname}
 Version:       3.2.19
-Release:       2
+Release:       3
 License:       Ruby-alike
 Group:         Development/Languages
 Source0:       http://rubygems.org/downloads/%{pkgname}-%{version}.gem
 # Source0-md5: 88ae7f86d4b8585a2108581145de6819
 URL:           http://rubyforge.org/projects/actionmailer/
-BuildRequires: rpmbuild(macros) >= 1.484
-BuildRequires: ruby >= 1:1.8.6
-BuildRequires: ruby-modules
-%{?ruby_mod_ver_requires_eq}
+BuildRequires: rpm-rubyprov
+BuildRequires: rpmbuild(macros) >= 1.665
 Requires:      ruby-actionpack >= 3.2.19
 Requires:      ruby-text-format
-Obsoletes:     ruby-ActionMailer
 Provides:      ruby-ActionMailer
-#BuildArch:    noarch
+Obsoletes:     ruby-ActionMailer
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# nothing to be placed there. we're not noarch only because of ruby packaging
-%define                _enable_debug_packages  0
-
 %description
 Action Mailer uses the Action Pack library to generate template-driven
 email.
@@ -65,13 +60,13 @@ Dokumentacji w formacie ri dla %{pkgname}.
 rdoc --ri --op ri lib
 rdoc --op rdoc lib
 rm ri/created.rid
-#rm -r ri/{system,Net,Test,Text}
+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_vendorlibdir},%{ruby_ridir},%{ruby_rdocdir}}
 
-cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
+cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{pkgname}-%{version}-%{release}
 
@@ -85,9 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.rdoc
-%{ruby_rubylibdir}/action_mailer
-%{ruby_rubylibdir}/action_mailer.rb
-%{ruby_rubylibdir}/rails/generators/mailer
+%{ruby_vendorlibdir}/action_mailer
+%{ruby_vendorlibdir}/action_mailer.rb
+%{ruby_vendorlibdir}/rails/generators/mailer
 %{ruby_specdir}/%{pkgname}-%{version}.gemspec
 
 %files rdoc