[packages/ruby-sqlite3] noarch rdoc/ri; add doc bcond

glen glen at pld-linux.org
Sun Mar 20 13:40:55 CET 2016


commit 441aa2f603c3c03a35d921bd15d12914010b9653
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Mar 20 14:40:43 2016 +0200

    noarch rdoc/ri; add doc bcond

 ruby-sqlite3.spec | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)
---
diff --git a/ruby-sqlite3.spec b/ruby-sqlite3.spec
index 62943c1..3202a1c 100644
--- a/ruby-sqlite3.spec
+++ b/ruby-sqlite3.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_without	doc			# don't build ri/rdoc
+
 %define		pkgname	sqlite3
 Summary:	SQLite3 module for Ruby
 Summary(pl.UTF-8):	Moduł SQLite3 dla Ruby
@@ -9,11 +13,10 @@ Group:		Development/Languages
 Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
 # Source0-md5:	7b7d8efe8af40a627090d3b257231453
 URL:		https://github.com/sparklemotion/sqlite3-ruby
-BuildRequires:	ruby-modules
-BuildRequires:	sqlite3-devel
 BuildRequires:	rpm-rubyprov
 BuildRequires:	rpmbuild(macros) >= 1.665
-%{?ruby_mod_ver_requires_eq}
+BuildRequires:	ruby-modules
+BuildRequires:	sqlite3-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,6 +30,10 @@ Summary:	HTML documentation for %{pkgname}
 Summary(pl.UTF-8):	Dokumentacja w formacie HTML dla %{pkgname}
 Group:		Documentation
 Requires:	ruby >= 1:1.8.7-4
+# noarch subpackages only when building with rpm5
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description rdoc
 HTML documentation for %{pkgname}.
@@ -39,6 +46,10 @@ Summary:	ri documentation for %{pkgname}
 Summary(pl.UTF-8):	Dokumentacja w formacie ri dla %{pkgname}
 Group:		Documentation
 Requires:	ruby
+# noarch subpackages only when building with rpm5
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description ri
 ri documentation for %{pkgname}.
@@ -62,22 +73,22 @@ cd ext/%{pkgname}
 
 rdoc --ri --op ri lib
 rdoc --op rdoc lib
-# rm -r ri/NOT_THIS_MODULE_RELATED_DIRS
 rm ri/created.rid
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_vendorarchdir}/sqlite3,%{ruby_vendorlibdir},%{ruby_ridir}} \
-	$RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version} \
-	$RPM_BUILD_ROOT%{ruby_specdir}
+install -d $RPM_BUILD_ROOT{%{ruby_vendorarchdir}/sqlite3,%{ruby_vendorlibdir},%{ruby_specdir}} \
+	$RPM_BUILD_ROOT
 
 cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
-cp -a ext/sqlite3/ri/* $RPM_BUILD_ROOT%{ruby_ridir}
-cp -a ext/sqlite3/rdoc/* $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
-
+cp -p %{pkgname}-%{version}.gemspec $RPM_BUILD_ROOT%{ruby_specdir}
 install -p ext/sqlite3/sqlite3_native.so $RPM_BUILD_ROOT%{ruby_vendorarchdir}/sqlite3
 
-cp -p %{pkgname}-%{version}.gemspec $RPM_BUILD_ROOT%{ruby_specdir}
+%if %{with doc}
+install -d $RPM_BUILD_ROOT{%{ruby_rdocdir}/%{name}-%{version},%{ruby_ridir}}
+cp -a ext/sqlite3/ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+cp -a ext/sqlite3/rdoc/* $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,10 +102,12 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_vendorlibdir}/sqlite3.rb
 %{ruby_specdir}/%{pkgname}-%{version}.gemspec
 
+%if %{with doc}
 %files rdoc
 %defattr(644,root,root,755)
 %{ruby_rdocdir}/%{name}-%{version}
 
 %files ri
 %defattr(644,root,root,755)
-%{ruby_ridir}/
+%{ruby_ridir}
+%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-sqlite3.git/commitdiff/441aa2f603c3c03a35d921bd15d12914010b9653



More information about the pld-cvs-commit mailing list