[projects/template-specs] cleanup ruby template

glen glen at pld-linux.org
Mon May 2 18:26:21 CEST 2016


commit 8a3ed6d3ecd19da5082d9a26e85a67acd44ffe33
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon May 2 19:25:27 2016 +0300

    cleanup ruby template

 ruby.spec | 62 ++++++++------------------------------------------------------
 1 file changed, 8 insertions(+), 54 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index f9689f5..2ba27c8 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -58,13 +58,9 @@ ri documentation for %{pkgname}.
 Dokumentacji w formacie ri dla %{pkgname}.
 
 %prep
-# gem
 %setup -q -n %{pkgname}-%{version}
-# tgz
-#%setup -q -n %{pkgname}-%{version}
 
-# ext build
-cp -p %{_datadir}/setup.rb .
+%{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -81,40 +77,6 @@ end'
 
 #'
 
-%if old
-cp %{_datadir}/setup.rb .
-%{__ruby} setup.rb config \
-	--rbdir=%{ruby_vendorlibdir} \
-	--sodir=%{ruby_vendorarchdir}
-
-ruby setup.rb config \
-	--site-ruby=%{ruby_vendorlibdir} \
-	--so-dir=%{ruby_vendorarchdir}
-
-ruby extconf.rb --vendor --with-pgsql-include=%{_includedir}/pgsql/server
-
-ruby setup.rb config \
-	--prefix=%{_prefix} \
-	--siterubyver=%{ruby_vendorlibdir} \
-	--siterubyverarch=%{ruby_vendorarchdir} \
-
-ruby setup.rb config \
-	--prefix=%{_prefix} \
-	--site-ruby=%{ruby_vendorlibdir}
-
-%{__ruby} install.rb \
-	--sitelibdir=%{ruby_vendorlibdir} \
-
-%cmake \
-	-DCUSTOM_RUBY_SITE_ARCH_DIR:PATH=%{ruby_vendorarchdir} \
-	-DCUSTOM_RUBY_SITE_LIB_DIR:PATH=%{ruby_vendorlibdir} \
-	..
-
-ruby setup.rb setup
-
-%{__ruby} setup.rb setup
-%endif
-
 # binary pkgs:
 cd ext/%{pkgname}
 %{__ruby} extconf.rb
@@ -135,31 +97,23 @@ rm ri/created.rid
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_ridir},%{ruby_rdocdir}}
-install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_ridir},%{ruby_rdocdir},%{_bindir}}
-%{__ruby} setup.rb install \
-	--prefix=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{ruby_vendorlibdir}
+install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_specdir}}
 cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
+cp -p %{pkgname}-%{version}.gemspec $RPM_BUILD_ROOT%{ruby_specdir}
 
+install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_specdir},%{_bindir}}
 cp -a bin/* $RPM_BUILD_ROOT%{_bindir}
-cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
 
+%if %{with doc}
+install -d $RPM_BUILD_ROOT{%{ruby_rdocdir}/%{name}-%{version},%{ruby_ridir}}
+cp -a rdoc/* $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+%endif
 
 # install ext
 install -d $RPM_BUILD_ROOT%{ruby_vendorarchdir}
 install -p ext/ruby_http_parser/ruby_http_parser.so $RPM_BUILD_ROOT%{ruby_vendorarchdir}
 
-install -d $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
-cp -a rdoc/* $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
-
-# install gemspec
-install -d $RPM_BUILD_ROOT%{ruby_specdir}
-install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_specdir}}
-cp -p %{pkgname}-%{version}.gemspec $RPM_BUILD_ROOT%{ruby_specdir}
-
 # install examples
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/template-specs.git/commitdiff/8c087412eaa4d5500a1699e18dc29fe9b9a84894



More information about the pld-cvs-commit mailing list