[packages/ruby-builder] install to vendordir; build noarch

glen glen at pld-linux.org
Sun Mar 20 13:53:22 CET 2016


commit ef7f6ace988118aef86d25ae02362c420c5647fd
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Mar 20 14:53:17 2016 +0200

    install to vendordir; build noarch

 ruby-builder.spec | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/ruby-builder.spec b/ruby-builder.spec
index 1e77ca7..62090fe 100644
--- a/ruby-builder.spec
+++ b/ruby-builder.spec
@@ -7,22 +7,19 @@ Summary:	Simple builder to facilitate programatic generation of XML markup
 Summary(pl.UTF-8):	Proste narzędzie do budowania ułatwiające programowe generowanie znaczników XML
 Name:		ruby-%{pkgname}
 Version:	3.0.0
-Release:	4
+Release:	5
 License:	Ruby's
 Group:		Development/Languages
 Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
 # Source0-md5:	cf9d2693d684a749e35dda886c4dc23c
 URL:		http://rubyforge.org/projects/builder
-BuildRequires:	rpmbuild(macros) >= 1.277
+BuildRequires:	rpm-rubyprov
+BuildRequires:	rpmbuild(macros) >= 1.665
 BuildRequires:	ruby-modules
 Conflicts:	ruby-activesupport < 3.0.0
-%{?ruby_mod_ver_requires_eq}
-#BuildArch:	noarch
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# nothing to be placed there. we're not noarc only because of ruby packaging
-%define		_enable_debug_packages	0
-
 %description
 Simple builder to facilitate programatic generation of XML markup.
 
@@ -65,14 +62,15 @@ Dokumentacji w formacie ri dla %{pkgname}.
 rdoc --op rdoc lib
 rdoc --ri --op ri lib
 rm ri/created.rid
+rm ri/cache.ri
 rm -r ri/{BlankSlate,Fixnum,Kernel,Module,Object,String}
 %endif
 
 %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}
 %if %{with doc}
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
@@ -87,9 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{ruby_rubylibdir}/blankslate.rb
-%{ruby_rubylibdir}/builder
-%{ruby_rubylibdir}/builder.rb
+%{ruby_vendorlibdir}/blankslate.rb
+%{ruby_vendorlibdir}/builder
+%{ruby_vendorlibdir}/builder.rb
 %{ruby_specdir}/%{pkgname}-%{version}.gemspec
 
 %if %{with doc}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-builder.git/commitdiff/ef7f6ace988118aef86d25ae02362c420c5647fd



More information about the pld-cvs-commit mailing list