Hello community, here is the log from the commit of package rubygem-rdoc for openSUSE:Factory checked in at 2013-05-02 11:48:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-rdoc (Old) and /work/SRC/openSUSE:Factory/.rubygem-rdoc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-rdoc" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-rdoc/rubygem-rdoc.changes 2013-04-22 14:20:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-rdoc.new/rubygem-rdoc.changes 2013-05-02 11:48:35.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Apr 22 14:27:37 UTC 2013 - mrueck...@suse.de + +- the binaries in this package should be named with -gem to avoid + conflicts on ruby 1.8 + +------------------------------------------------------------------- +Mon Apr 22 14:18:56 UTC 2013 - mrueck...@suse.de + +- use internal rdoc libraries when building on 1.8 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-rdoc.spec ++++++ --- /var/tmp/diff_new_pack.dsswoS/_old 2013-05-02 11:48:36.000000000 +0200 +++ /var/tmp/diff_new_pack.dsswoS/_new 2013-05-02 11:48:36.000000000 +0200 @@ -15,6 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%if 0%{?suse_version} && 0%{?suse_version} < 1220 +%define needs_internal_rdoc 1 +%endif Name: rubygem-rdoc Version: 4.0.1 @@ -28,6 +31,9 @@ BuildRequires: ruby-devel >= 1.8.7 #MANUAL - no rdoc #BuildRequires: rubygem(rdoc) > 3.10 +%if 0%{?needs_internal_rdoc} +BuildRequires: rubygem(json) +%endif Url: http://docs.seattlerb.org/rdoc Source: http://rubygems.org/gems/%{mod_full_name}.gem Summary: RDoc produces HTML and command-line documentation for Ruby projects @@ -67,17 +73,20 @@ %build %install +%if 0%{?needs_internal_rdoc} +export RUBYLIB="%{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/lib/" +%endif %gem_install -f mv %{buildroot}%{_bindir}/rdoc{,%{mod_branch}} -ln -s rdoc%{mod_branch} %{buildroot}%{_bindir}/rdoc +ln -s rdoc%{mod_branch} %{buildroot}%{_bindir}/rdoc-gem mv %{buildroot}%{_bindir}/ri{,%{mod_branch}} -ln -s ri%{mod_branch} %{buildroot}%{_bindir}/ri +ln -s ri%{mod_branch} %{buildroot}%{_bindir}/ri-gem %post /usr/sbin/update-alternatives --install \ - %{_bindir}/rdoc rdoc %{_bindir}/rdoc%{mod_branch} %{mod_weight} + %{_bindir}/rdoc-gem rdoc %{_bindir}/rdoc%{mod_branch} %{mod_weight} /usr/sbin/update-alternatives --install \ - %{_bindir}/ri ri %{_bindir}/ri%{mod_branch} %{mod_weight} + %{_bindir}/ri-gem ri %{_bindir}/ri%{mod_branch} %{mod_weight} %preun if [ "$1" = 0 ] ; then @@ -90,9 +99,9 @@ %files %defattr(-,root,root,-) %{_bindir}/rdoc%{mod_branch} -%ghost %{_bindir}/rdoc +%ghost %{_bindir}/rdoc-gem %{_bindir}/ri%{mod_branch} -%ghost %{_bindir}/ri +%ghost %{_bindir}/ri-gem %{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ %exclude %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/test -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
