Relax version check.

.gitignore

@@ -5,3 +5,4 @@
 /command-t-1.10.tar.gz
 /command-t-1.13.tar.gz
 /command-t-2.0.zip
+/command-t-3.0.2.zip

sources

@@ -1 +1 @@
-05bef9a19943f869b6e6fb31bde0bebf  command-t-2.0.zip
+2f4d086bf1c8b64edeb803c6af46fe8e  command-t-3.0.2.zip

vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch

@@ -0,0 +1,43 @@
+From 4f1aefbeca21b6b3eb74252b70e8608dd20bc36a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Tue, 3 May 2016 07:45:56 +0200
+Subject: [PATCH] Check RUBY_LIB_VERSION instead of RUBY_VERSION.
+
+---
+ autoload/commandt.vim     | 3 +--
+ ruby/command-t/extconf.rb | 5 +----
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/autoload/commandt.vim b/autoload/commandt.vim
+index 7513f55..1299731 100644
+--- a/autoload/commandt.vim
++++ b/autoload/commandt.vim
+@@ -169,8 +169,7 @@ ruby << EOF
+     # compiled with.
+     patchlevel = defined?(RUBY_PATCHLEVEL) ? RUBY_PATCHLEVEL : nil
+     if CommandT::Metadata::UNKNOWN == true || (
+-      CommandT::Metadata::EXPECTED_RUBY_VERSION == RUBY_VERSION &&
+-      CommandT::Metadata::EXPECTED_RUBY_PATCHLEVEL == patchlevel
++      CommandT::Metadata::EXPECTED_RUBY_LIB_VERSION == RbConfig::CONFIG['RUBY_LIB_VERSION']
+     )
+       require 'command-t/ext' # eager load, to catch compilation problems early
+       $command_t = CommandT::Controller.new
+diff --git a/ruby/command-t/extconf.rb b/ruby/command-t/extconf.rb
+index 8603dad..643fa6a 100644
+--- a/ruby/command-t/extconf.rb
++++ b/ruby/command-t/extconf.rb
+@@ -55,10 +55,7 @@ basedir = Pathname.new(__FILE__).dirname
+     # This file was generated by #{(basedir + 'extconf.rb').to_s}
+     module CommandT
+       module Metadata
+-        EXPECTED_RUBY_VERSION = #{RUBY_VERSION.inspect}
+-        EXPECTED_RUBY_PATCHLEVEL = #{
+-          defined?(RUBY_PATCHLEVEL) ? RUBY_PATCHLEVEL.inspect : nil.inspect
+-        }
++        EXPECTED_RUBY_LIB_VERSION = #{RbConfig::MAKEFILE_CONFIG['RUBY_LIB_VERSION'].inspect}
+         UNKNOWN = false
+       end # module Metadata
+     end # module CommandT
+-- 
+2.8.2
+

vim-command-t-1.10-support-Rspec-3-style.patch

@@ -1,46 +0,0 @@
-From af2f6a55c745c2a3368f6146f1003c709541c813 Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka@fedoraproject.org>
-Date: Sun, 18 Jan 2015 13:20:48 +0900
-Subject: [PATCH] support Rspec 3 style
-
-Just change be_true to be_truthy, be_false to be_falsey
----
- spec/command-t/watchman/utils_spec.rb | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/spec/command-t/watchman/utils_spec.rb b/spec/command-t/watchman/utils_spec.rb
-index 4bb5c4e..80cc899 100644
---- a/spec/command-t/watchman/utils_spec.rb
-+++ b/spec/command-t/watchman/utils_spec.rb
-@@ -71,11 +71,11 @@ describe CommandT::Watchman::Utils do
-   end
- 
-   it 'roundtrips `true` booleans' do
--    expect(roundtrip(true)).to be_true
-+    expect(roundtrip(true)).to be_truthy
-   end
- 
-   it 'roundtrips `false` booleans' do
--    expect(roundtrip(false)).to be_false
-+    expect(roundtrip(false)).to be_falsey
-   end
- 
-   it 'roundtrips nil' do
-@@ -278,12 +278,12 @@ describe CommandT::Watchman::Utils do
- 
-     it 'loads boolean `true` values' do
-       input = binary("\x00\x01\x03\x01\x08")
--      expect(described_class.load(input)).to be_true
-+      expect(described_class.load(input)).to be_truthy
-     end
- 
-     it 'loads boolean `false` values' do
-       input = binary("\x00\x01\x03\x01\x09")
--      expect(described_class.load(input)).to be_false
-+      expect(described_class.load(input)).to be_falsey
-     end
- 
-     it 'loads nil' do
--- 
-2.2.1
-

vim-command-t.spec

@@ -7,16 +7,16 @@
 %global appdata_dir %{_datadir}/appdata
 
 Name: vim-command-t
-Version: 2.0
+Version: 3.0.2
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: An extremely fast, intuitive mechanism for opening files in VIM
 Group: Applications/Editors
 License: BSD
 URL: https://wincent.com/products/command-t
 Source0: http://s3.wincent.com/command-t/releases/command-t-%{version}.zip
-# Support rspec3 style
+# Relax the Command-T version checking.
-# https://github.com/wincent/command-t/issues/190
+# https://github.com/wincent/command-t/issues/192
-Patch1: vim-command-t-1.10-support-Rspec-3-style.patch
+Patch0: vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch
 Requires: ruby(release)
 # 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
@@ -47,7 +47,7 @@ more weight.
 %prep
 %setup -q -c
 
-%patch1 -p1
+%patch0 -p1
 
 %build
 pushd ./ruby/command-t
@@ -70,10 +70,6 @@ mv %{buildroot}%{vimfiles}/ruby/command-t/ext.so %{buildroot}%{commandt_so_dir}
 # Remove all dot files.
 find %{buildroot}%{vimfiles} -name '.*' -delete
 
-# Replace symlink with copy.
-rm README.txt
-cp -pa doc/command-t.txt README.txt
-
 # Install AppData.
 mkdir -p %{buildroot}%{appdata_dir}
 install -m 644 appstream/vim-command-t.metainfo.xml %{buildroot}%{appdata_dir}
@@ -82,12 +78,12 @@ install -m 644 appstream/vim-command-t.metainfo.xml %{buildroot}%{appdata_dir}
 # Get rid of Bundler
 sed -i '/Bundler/,/^end$/ s/^/#/' spec/spec_helper.rb
 
-# Ignore failing test:
+## Ignore failing test:
-# CommandT::Matcher#sorted_matches_for provides intuitive results for "artcon" and "articles_controller"
+## CommandT::Matcher#sorted_matches_for provides intuitive results for "artcon" and "articles_controller"
-# https://github.com/wincent/command-t/issues/189
+## https://github.com/wincent/command-t/issues/189
-sed -i '/provides intuitive results for "artcon" and "articles_controller"/,/^    end$/ s/^/#/' \
+#sed -i '/provides intuitive results for "artcon" and "articles_controller"/,/^    end$/ s/^/#/' \
-  spec/command-t/matcher_spec.rb
+#  spec/command-t/matcher_spec.rb
-
+#
 rspec -Iruby spec
 
 %post
@@ -99,7 +95,7 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null
 
 %files
 %license LICENSE
-%doc README.txt
+%doc README.md
 %{commandt_so_dir}
 %{vimfiles}/autoload/*
 %{vimfiles}/doc/*
@@ -116,6 +112,10 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null
 
 
 %changelog
+* Tue May 03 2016 Vít Ondruch <vondruch@redhat.com> - 3.0.2-1
+- Update to Command-T 3.0.2.
+- Relax version check.
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild