From 874ffca723876054d816148f0d19edb31fbe12aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Wed, 30 Apr 2014 10:12:54 +0200
Subject: [PATCH] Update to Command-T 1.8.

---
 .gitignore                                    |  1 +
 sources                                       |  2 +-
 ...ys-prepend-space-to-DPROCESSOR_COUNT.patch | 25 -------------------
 vim-command-t.spec                            | 10 +++-----
 4 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 vim-command-t-1.6-Always-prepend-space-to-DPROCESSOR_COUNT.patch

diff --git a/.gitignore b/.gitignore
index 5c30af8..91b1ea8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /command-t-1.4.tar.gz
 /command-t-1.5.tar.gz
 /command-t-1.6.tar.gz
+/command-t-1.8.tar.gz
diff --git a/sources b/sources
index c700a85..f0962d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a739517689a4f41e04998b9f1a68eae  command-t-1.6.tar.gz
+5ca34230eebbfae449c1399ba591591b  command-t-1.8.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
deleted file mode 100644
index ca15d56..0000000
--- a/vim-command-t-1.6-Always-prepend-space-to-DPROCESSOR_COUNT.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 1f256d9..2e6519c 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.6
+Version: 1.8
 Release: 1%{?dist}
 Summary: An extremely fast, intuitive mechanism for opening files in VIM
 Group: Applications/Editors
@@ -16,9 +16,6 @@ URL: https://wincent.com/products/command-t
 # git clone git://git.wincent.com/command-t.git && cd command-t/
 # 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,8 +45,6 @@ more weight.
 %prep
 %setup -q -c
 
-%patch0 -p1
-
 %build
 pushd ./ruby/command-t
 
@@ -105,6 +100,9 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null
 
 
 %changelog
+* Tue Apr 29 2014 Vít Ondruch <vondruch@redhat.com> - 1.8-1
+- Update to Command-T 1.8.
+
 * Thu Dec 19 2013 Vít Ondruch <vondruch@redhat.com> - 1.6-1
 - Update to command-t 1.6.