commit 76a229942e9425665091638d9093db2ae98d40ed
Author: Elan Ruusamäe <[email protected]>
Date:   Thu Oct 20 23:27:23 2016 +0300

    subpackage test-unit

 ruby.spec | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index 03c8249..dc04707 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -690,16 +690,10 @@ install -d $RPM_BUILD_ROOT%{ruby_libarchdir}/json/ext
 ln -s %{gem_libdir}/json-%{json_ver}/lib/json/ext/parser.so 
$RPM_BUILD_ROOT%{ruby_libarchdir}/json/ext
 ln -s %{gem_libdir}/json-%{json_ver}/lib/json/ext/generator.so 
$RPM_BUILD_ROOT%{ruby_libarchdir}/json/ext
 
-#install -d $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/lib
-#%{__mv} $RPM_BUILD_ROOT%{ruby_libdir}/minitest 
$RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/lib
 ln -s %{gem_dir}/gems/minitest-%{minitest_ver}/lib/minitest 
$RPM_BUILD_ROOT%{ruby_libdir}
-#%{__mv} 
$RPM_BUILD_ROOT%{gem_dir}/specifications/default/minitest-%{minitest_ver}.gemspec
 $RPM_BUILD_ROOT%{gem_dir}/specifications
 
-#install -d $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
 install -d $RPM_BUILD_ROOT%{ruby_libdir}/test
-#mv $RPM_BUILD_ROOT%{ruby_libdir}/test/unit 
$RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
 ln -s %{gem_dir}/gems/test-unit-%{test_unit_ver}/lib/unit 
$RPM_BUILD_ROOT%{ruby_libdir}/test
-#mv 
$RPM_BUILD_ROOT%{gem_dir}/specifications/default/test-unit-%{test_unit_ver}.gemspec
 $RPM_BUILD_ROOT%{gem_dir}/specifications
 
 install -d $RPM_BUILD_ROOT%{gem_dir}/gems/psych-%{psych_ver}/lib
 install -d $RPM_BUILD_ROOT%{gem_libdir}/psych-%{psych_ver}/lib
@@ -753,6 +747,9 @@ ln -sf %{gem_dir}/gems/rake-%{rake_ver}/bin/rake 
$RPM_BUILD_ROOT%{_bindir}/rake%
        
$RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/{drb,logger,openssl,ripper,rss}/*.rb
 \
        $RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/webrick/*.cgi
 
+# strip gem own tests
+%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/test
+
 %if %{without batteries}
 # packaged separately
 %{__rm} -r $RPM_BUILD_ROOT%{ruby_libdir}/{rubygems,rake,json,minitest}
@@ -900,6 +897,13 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{gem_dir}/gems/minitest-%{minitest_ver}/.*
 %{gem_dir}/specifications/minitest-%{minitest_ver}.gemspec
 
+%files test-unit
+%defattr(644,root,root,755)
+%dir %{gem_dir}/gems/test-unit-%{test_unit_ver}
+%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
+%{gem_dir}/specifications/test-unit-%{test_unit_ver}.gemspec
+%{_mandir}/man1/testrb%{ruby_suffix}.1*
+
 %files modules
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/erb%{ruby_suffix}
@@ -1083,15 +1087,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{gem_libdir}/psych-%{psych_ver}/lib
 %attr(755,root,root) %{gem_libdir}/psych-%{psych_ver}/lib/psych.so
 
-# test-unit
-%{gem_dir}/specifications/test-unit-%{test_unit_ver}.gemspec
-%dir %{gem_dir}/gems/test-unit-%{test_unit_ver}
-%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
-#%dir %{gem_dir}/gems/test-unit-%{test_unit_ver}/bin
-#%attr(755,root,root) %{gem_dir}/gems/test-unit-%{test_unit_ver}/bin/testrb
-#%attr(755,root,root) %{_bindir}/testrb%{ruby_suffix}
-%{_mandir}/man1/testrb%{ruby_suffix}.1*
-
 %dir %{gem_dir}
 %dir %{gem_dir}/gems
 %dir %{gem_dir}/specifications
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/945923861a135e7e1ba3a008c8ca568a2bb059b1

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to