- missing defattr for -static, moved headers to -devel

[packages/ruby.git] / ruby.spec

diff --git a/ruby.spec b/ruby.spec
index 04a268497f05cb54fd6360d81979ff36be988b67..1a6d63fd43d20535c8aff5a8bbd689763202f0fb 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,3 +1,4 @@
+%define ruby_ridir %{_datadir}/ri/1.8/system
 Summary:       Ruby - interpreted scripting language
 Summary(ja):   ¥ª¥Ö¥¸¥§¥¯¥È»Ø¸þ¸À¸ìRuby¥¤¥ó¥¿¥×¥ê¥¿
 Summary(pl):   Ruby - interpretowany jêzyk skryptowy
@@ -6,7 +7,7 @@ Summary(zh_CN): ruby - һ
 Name:          ruby
 Version:       1.8.2
 %define pre preview2
-Release:       0.%{pre}.1
+Release:       2
 License:       The Ruby License
 Group:         Development/Languages
 #Source0:      http://www.ruby-lang.org/%{name}-%{version}.tar.gz
@@ -88,6 +89,7 @@ Ten pakiet zawiera wi
 Summary:       Ruby development libraries
 Summary(pl):   Biblioteki programistyczne interpretera jêzyka Ruby
 Group:         Development/Languages
+Requires:      %{name} = %{version}-%{release}
 
 %description devel
 Ruby development libraries.
@@ -95,6 +97,18 @@ Ruby development libraries.
 %description devel -l pl
 Biblioteki programistyczne interpretera jêzyka Ruby.
 
+%package static
+Summary:       Ruby static libraries
+Summary(pl):   Biblioteki statyczne Ruby
+Group:         Development/Languages
+Requires:      %{name} = %{version}-%{release}
+
+%description static
+Ruby static libraries.
+
+%description devel -l pl
+Biblioteki statyczne Ruby.
+
 %prep
 %setup -q -a1 -a2 -a3 -a5
 %patch0 -p1
@@ -119,11 +133,13 @@ cd ..
 %{__make}
 
 %{__make} info -C %{name}-texi-1.4-en
+
 ./miniruby -I lib bin/rdoc -o rdoc
+./miniruby -I lib -I ext/syck bin/rdoc --ri -o ri
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_infodir},%{_mandir}/man1,%{_examplesdir}/%{name}-%{version}}
+install -d $RPM_BUILD_ROOT{%{_infodir},%{_mandir}/man1,%{_examplesdir}/%{name}-%{version},%{ruby_ridir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -135,6 +151,8 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1
 mv -f ruby-uguide guide
 mv -f rubyfaq faq
 
+cp -a ri/ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -151,7 +169,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc guide faq misc README README.EXT ChangeLog ToDo rdoc
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%attr(755,root,root) %{_libdir}/lib*.so
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/1.8
 %{_libdir}/%{name}/1.8/bigdecimal
@@ -190,18 +207,28 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/1.8/tsort.rb
 %{_libdir}/%{name}/1.8/[u-z]*.rb
 %dir %{_libdir}/%{name}/1.8/*-linux*
-%attr(755,root,root) %{_libdir}/%{name}/1.8/*-linux*/[a-s]*
-%attr(755,root,root) %{_libdir}/%{name}/1.8/*-linux*/[u-z]*
+%attr(755,root,root) %{_libdir}/%{name}/1.8/*-linux*/[a-s]*.so
+%attr(755,root,root) %{_libdir}/%{name}/1.8/*-linux*/[u-z]*.so
+%attr(755,root,root) %{_libdir}/%{name}/1.8/*-linux*/digest/*.so
+%attr(755,root,root) %{_libdir}/%{name}/1.8/*-linux*/io/*.so
+%attr(755,root,root) %{_libdir}/%{name}/1.8/*-linux*/racc/*.so
+%{_libdir}/%{name}/1.8/*-linux*/rbconfig.rb
 %dir %{_ulibdir}/%{name}/site_ruby
 %dir %{_ulibdir}/%{name}/site_ruby/1.8
 %dir %{_ulibdir}/%{name}/site_ruby/1.8/*-linux*
-
+%dir %{ruby_ridir}
+%{ruby_ridir}/*
 %{_mandir}/*/*
 %{_infodir}/*.info*
 %{_examplesdir}/%{name}-%{version}
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/%{name}/1.8/*/*.h
+
+%files static
+%defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
 %files tk