[packages/ruby-mail] build noarch, install to vendor dirs; review deps

glen glen at pld-linux.org
Wed Sep 11 12:37:16 CEST 2013

commit 10599c00d130949cc066ffcbdd4c8b9520bc73dc
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Sep 11 13:37:00 2013 +0300

    build noarch, install to vendor dirs; review deps

 ruby-mail.spec | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)
diff --git a/ruby-mail.spec b/ruby-mail.spec
index 13768cd..a9df9a5 100644
--- a/ruby-mail.spec
+++ b/ruby-mail.spec
@@ -1,5 +1,5 @@
 %define pkgname mail
-Summary:	A Really Ruby Mail Library 
+Summary:	A Really Ruby Mail Library
 Name:		ruby-%{pkgname}
 Version:	2.1.3
 Release:	3
@@ -9,20 +9,13 @@ Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
 Patch0:		%{name}-vendor.patch
 Group:		Development/Languages
 URL:		http://github.com/mikel/mail
-BuildRequires:	rpmbuild(macros) >= 1.484
-BuildRequires:	ruby >= 1:1.8.6
-BuildRequires:	ruby-modules
-Requires:	ruby-activesupport
+BuildRequires:	rpm-rubyprov
+BuildRequires:	rpmbuild(macros) >= 1.665
+Requires:	ruby-activesupport >= 2.3.4
 Requires:	ruby-mime-types
-Requires:	ruby-rake
-Requires:	ruby-treetop
-#BuildArch:	noarch
+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
 A Really Ruby Mail Library.
@@ -51,9 +44,7 @@ ri documentation for %{pkgname}.
 Dokumentacji w formacie ri dla %{pkgname}.
-%setup -q -c
-%{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
-find -newer README.rdoc -o -print | xargs touch --reference %{SOURCE0}
+%setup -q -n %{pkgname}-%{version}
 %patch0 -p1
 rm -r lib/mail/vendor
@@ -62,13 +53,12 @@ rm -r lib/mail/vendor
 rdoc --ri --op ri lib
 rdoc --op rdoc lib
 rm ri/created.rid
-rm -r ri/{NilClass,String}
+rm ri/cache.ri
-install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}}
-cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
+install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_ridir},%{ruby_rdocdir}}
+cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
@@ -78,9 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGELOG.rdoc README.rdoc TODO.rdoc
 %files rdoc

---- gitweb:


More information about the pld-cvs-commit mailing list