From 5fb86726a7832d6b1bc446e793eabbbb7de7d355 Mon Sep 17 00:00:00 2001
From: Vít Ondruch <vondruch@redhat.com>
Date: Dec 19 2013 14:19:19 +0000
Subject: Update to command-t 1.6.


---

diff --git a/.gitignore b/.gitignore
index 7df22c8..5c30af8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /command-t-1.4.tar.gz
 /command-t-1.5.tar.gz
+/command-t-1.6.tar.gz
diff --git a/sources b/sources
index 04ab45b..c700a85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f989c2c527b82aae0048de0c5f131d7  command-t-1.5.tar.gz
+6a739517689a4f41e04998b9f1a68eae  command-t-1.6.tar.gz
diff --git a/vim-command-t-1.6-Always-prepend-space-to-DPROCESSOR_COUNT.patch b/vim-command-t-1.6-Always-prepend-space-to-DPROCESSOR_COUNT.patch
new file mode 100644
index 0000000..ca15d56
--- /dev/null
+++ b/vim-command-t-1.6-Always-prepend-space-to-DPROCESSOR_COUNT.patch
@@ -0,0 +1,25 @@
+From 64821ca4df5e8e88c9ff77836e29f33712d3009b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Thu, 19 Dec 2013 14:43:41 +0100
+Subject: [PATCH] Always prepend space to -DPROCESSOR_COUNT.
+
+This prevents issues when something is already declared in DEFS.
+---
+ ruby/command-t/extconf.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ruby/command-t/extconf.rb b/ruby/command-t/extconf.rb
+index e38cdd8..bf3c6c8 100644
+--- a/ruby/command-t/extconf.rb
++++ b/ruby/command-t/extconf.rb
+@@ -99,6 +99,6 @@ RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+ count = processor_count
+ count = 1 if count < 0   # sanity check
+ count = 32 if count > 32 # sanity check
+-RbConfig::MAKEFILE_CONFIG['DEFS'] += "-DPROCESSOR_COUNT=#{count}"
++RbConfig::MAKEFILE_CONFIG['DEFS'] += " -DPROCESSOR_COUNT=#{count}"
+ 
+ create_makefile('ext')
+-- 
+1.8.4.2
+
diff --git a/vim-command-t.spec b/vim-command-t.spec
index 3d07f4e..1f256d9 100644
--- a/vim-command-t.spec
+++ b/vim-command-t.spec
@@ -5,7 +5,7 @@
 %global commandt_so_dir %{ruby_vendorarchdir}/command-t
 
 Name: vim-command-t
-Version: 1.5
+Version: 1.6
 Release: 1%{?dist}
 Summary: An extremely fast, intuitive mechanism for opening files in VIM
 Group: Applications/Editors
@@ -13,12 +13,12 @@ License: BSD
 URL: https://wincent.com/products/command-t
 # Officialy distributed only using vimball:
 # https://wincent.com/issues/1978
-# .gitattributes are used to ignore huge benchmark.yml file.
-# https://github.com/wincent/Command-T/pull/56
 # git clone git://git.wincent.com/command-t.git && cd command-t/
-# echo "data/benchmark.yml export-ignore" > .gitattributes
-# git archive 1.5 -o command-t-1.5.tar.gz --worktree-attributes
+# git archive 1.6 -o command-t-1.6.tar.gz
 Source0: command-t-%{version}.tar.gz
+# Fixes build on i386, where DEFS already contains some definition.
+# https://github.com/wincent/Command-T/pull/60
+Patch0: vim-command-t-1.6-Always-prepend-space-to-DPROCESSOR_COUNT.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
@@ -48,6 +48,8 @@ more weight.
 %prep
 %setup -q -c
 
+%patch0 -p1
+
 %build
 pushd ./ruby/command-t
 
@@ -77,10 +79,6 @@ cp -pa doc/command-t.txt README.txt
 # Get rid of Bundler
 sed -i '24,+5d' spec/spec_helper.rb
 
-# Test suite fails with "NoMethodError: undefined method `evaluate' for VIM:Module".
-# https://wincent.com/issues/2111
-sed -i '/@base_wild_ignore     = VIM::wild_ignore/ s/^/#/' ruby/command-t/scanner/file_scanner.rb
-
 rspec -Iruby spec
 
 %post
@@ -107,6 +105,9 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null
 
 
 %changelog
+* Thu Dec 19 2013 Vít Ondruch <vondruch@redhat.com> - 1.6-1
+- Update to command-t 1.6.
+
 * Mon Sep 23 2013 Vít Ondruch <vondruch@redhat.com> - 1.5-1
 - Update to command-t 1.5.