Merge branch 'f18' into f17

vim-command-t.spec

@@ -7,7 +7,7 @@
 
 Name: vim-command-t
 Version: 1.4
-Release: 1%{?dist}
+Release: 4%{?dist}
 Summary: An extremely fast, intuitive mechanism for opening files in VIM
 Group: Applications/Editors
 License: BSD
@@ -18,6 +18,12 @@ URL: https://wincent.com/products/command-t
 # git archive 1.4 -o command-t-1.4.tar.gz
 Source0: command-t-%{version}.tar.gz
 Requires: ruby(abi) = %{rubyabi}
+# Although command-t does not depend on rubygems directly, the RubyGems are
+# required by Ruby, but not always (rhbz#845011). So it is necessary to enforce
+# the RubyGems dependency, to fix possile SEGFAULT (rhbz#858135). There is
+# unfortunately nothing better to do about it, as long as RPM/YUM does not
+# support some conditional requires.
+Requires: ruby(rubygems)
 Requires: vim-common
 BuildRequires: ruby(abi) = %{rubyabi}
 BuildRequires: ruby-devel
@@ -95,5 +101,8 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null
 
 
 %changelog
+* Wed Apr 10 2013 Vít Ondruch <vondruch@redhat.com> - 1.4-4
+- Add dependency on RubyGems to fix possible SEGFAULT (rhbz#858135).
+
 * Fri Aug 03 2012 Vít Ondruch <vondruch@redhat.com> - 1.4-1
 - Initial package.