[projects/template-specs] update samples

glen glen at pld-linux.org
Thu Jun 20 22:44:22 CEST 2013


commit 8cb1efbe7345e870e383ff5bcac888f3980c75d4
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jun 20 23:44:16 2013 +0300

    update samples

 ruby.spec | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index 3bce54c..0d2f57e 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -67,38 +67,35 @@ find -newer README -o -print | xargs touch --reference %{SOURCE0}
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %build
+%if old
 cp %{_datadir}/setup.rb .
 %{__ruby} setup.rb config \
-	--rbdir=%{ruby_rubylibdir} \
-	--sodir=%{ruby_archdir}
+	--rbdir=%{ruby_vendorlibdir} \
+	--sodir=%{ruby_vendorarchdir}
 
 ruby extconf.rb --vendor --with-pgsql-include=%{_includedir}/pgsql/server
 
 ruby setup.rb config \
-    --prefix=%{_prefix} \
-    --siterubyver=%{ruby_vendorlibdir} \
-    --siterubyverarch=%{ruby_vendorarchdir} \
+	--prefix=%{_prefix} \
+	--siterubyver=%{ruby_vendorlibdir} \
+	--siterubyverarch=%{ruby_vendorarchdir} \
 
 ruby setup.rb config \
-    --prefix=%{_prefix} \
-    --site-ruby=%{ruby_vendorlibdir}
+	--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} \
-  ..
+	-DCUSTOM_RUBY_SITE_ARCH_DIR:PATH=%{ruby_vendorarchdir} \
+	-DCUSTOM_RUBY_SITE_LIB_DIR:PATH=%{ruby_vendorlibdir} \
+	..
 
 ruby setup.rb setup
 
 %{__ruby} setup.rb setup
-
-rdoc --ri --op ri lib
-rdoc --op rdoc lib
-# rm -r ri/NOT_THIS_MODULE_RELATED_DIRS
-rm ri/created.rid
+%endif
 
 # binary pkgs:
 %{__ruby} extconf.rb
@@ -107,6 +104,12 @@ rm ri/created.rid
 	LDFLAGS="%{rpmldflags}" \
 	CFLAGS="%{rpmcflags} -fPIC"
 
+# with rdoc/ri:
+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_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}}
@@ -122,6 +125,10 @@ cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
 
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 
+# 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}
 
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list