From 883369dbbe0e8264e0c9cb55fdbbc457ff92a910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 23 Sep 2013 17:05:01 +0200 Subject: [PATCH 1/5] Update to command-t 1.5. --- .gitignore | 1 + sources | 2 +- vim-command-t.spec | 16 +++++++++++++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c3e1972..7df22c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /command-t-1.4.tar.gz +/command-t-1.5.tar.gz diff --git a/sources b/sources index e368f5f..04ab45b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d98188718066276cc26ec4ea5002c076 command-t-1.4.tar.gz +8f989c2c527b82aae0048de0c5f131d7 command-t-1.5.tar.gz diff --git a/vim-command-t.spec b/vim-command-t.spec index 49ed72c..3d07f4e 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -5,16 +5,19 @@ %global commandt_so_dir %{ruby_vendorarchdir}/command-t Name: vim-command-t -Version: 1.4 -Release: 5%{?dist} +Version: 1.5 +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 # 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/ -# git archive 1.4 -o command-t-1.4.tar.gz +# echo "data/benchmark.yml export-ignore" > .gitattributes +# git archive 1.5 -o command-t-1.5.tar.gz --worktree-attributes Source0: command-t-%{version}.tar.gz Requires: ruby(release) # Although command-t does not depend on rubygems directly, the RubyGems are @@ -74,6 +77,10 @@ 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 @@ -100,6 +107,9 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %changelog +* Mon Sep 23 2013 Vít Ondruch - 1.5-1 +- Update to command-t 1.5. + * Sun Aug 04 2013 Fedora Release Engineering - 1.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 63f920efeb901c8cfe991f65dc2e59a5e1b7bcd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 19 Dec 2013 15:19:19 +0100 Subject: [PATCH 2/5] Update to command-t 1.6. --- .gitignore | 1 + sources | 2 +- ...ys-prepend-space-to-DPROCESSOR_COUNT.patch | 25 +++++++++++++++++++ vim-command-t.spec | 19 +++++++------- 4 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 vim-command-t-1.6-Always-prepend-space-to-DPROCESSOR_COUNT.patch 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?= +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 - 1.6-1 +- Update to command-t 1.6. + * Mon Sep 23 2013 Vít Ondruch - 1.5-1 - Update to command-t 1.5. From 874ffca723876054d816148f0d19edb31fbe12aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 30 Apr 2014 10:12:54 +0200 Subject: [PATCH 3/5] 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?= -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 - 1.8-1 +- Update to Command-T 1.8. + * Thu Dec 19 2013 Vít Ondruch - 1.6-1 - Update to command-t 1.6. From 1005d22be8286fddc96c107889c0ad384ce759a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 11 Aug 2014 14:45:58 +0200 Subject: [PATCH 4/5] Update to Command-T 1.10. --- .gitignore | 1 + sources | 2 +- vim-command-t.spec | 14 +++++++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 91b1ea8..108cc89 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /command-t-1.5.tar.gz /command-t-1.6.tar.gz /command-t-1.8.tar.gz +/command-t-1.10.tar.gz diff --git a/sources b/sources index f0962d1..0a15278 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ca34230eebbfae449c1399ba591591b command-t-1.8.tar.gz +f7ef747b3a8beae15b711079eb3aaa3c command-t-1.10.tar.gz diff --git a/vim-command-t.spec b/vim-command-t.spec index 2e6519c..eb950d0 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.8 +Version: 1.10 Release: 1%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors @@ -14,7 +14,7 @@ URL: https://wincent.com/products/command-t # Officialy distributed only using vimball: # https://wincent.com/issues/1978 # git clone git://git.wincent.com/command-t.git && cd command-t/ -# git archive 1.6 -o command-t-1.6.tar.gz +# git archive 1.10 -o command-t-1.10.tar.gz Source0: command-t-%{version}.tar.gz Requires: ruby(release) # Although command-t does not depend on rubygems directly, the RubyGems are @@ -57,7 +57,7 @@ popd %install mkdir -p %{buildroot}%{vimfiles} -cp -par {doc,plugin,ruby} %{buildroot}%{vimfiles} +cp -par {autoload,doc,plugin,ruby} %{buildroot}%{vimfiles} mkdir -p %{buildroot}%{commandt_so_dir} chmod 0755 %{buildroot}%{vimfiles}/ruby/command-t/ext.so @@ -72,7 +72,7 @@ cp -pa doc/command-t.txt README.txt %check # Get rid of Bundler -sed -i '24,+5d' spec/spec_helper.rb +sed -i '/Bundler/,/^end$/ s/^/#/' spec/spec_helper.rb rspec -Iruby spec @@ -87,6 +87,7 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %doc LICENSE %doc README.txt %{commandt_so_dir} +%{vimfiles}/autoload/* %{vimfiles}/doc/* %{vimfiles}/plugin/* %exclude %{vimfiles}/ruby/command-t/ext* @@ -96,10 +97,13 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %exclude %{vimfiles}/ruby/command-t/Makefile %exclude %{vimfiles}/ruby/command-t/mkmf.log %exclude %{vimfiles}/ruby/command-t/depend -%{vimfiles}/ruby/* +%{vimfiles}/ruby %changelog +* Mon Aug 11 2014 Vít Ondruch - 1.10-1 +- Update to Command-T 1.10. + * Tue Apr 29 2014 Vít Ondruch - 1.8-1 - Update to Command-T 1.8. From 167dc6795f2fad2adae3b6552d58df770a29e5cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 15 Aug 2014 10:25:37 +0200 Subject: [PATCH 5/5] Fix BE arch issues. --- ...-failure-on-big-endian-architectures.patch | 75 +++++++++++++++++++ vim-command-t.spec | 10 ++- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 vim-command-t-1.10-Fix-test-failure-on-big-endian-architectures.patch diff --git a/vim-command-t-1.10-Fix-test-failure-on-big-endian-architectures.patch b/vim-command-t-1.10-Fix-test-failure-on-big-endian-architectures.patch new file mode 100644 index 0000000..e8ee8ff --- /dev/null +++ b/vim-command-t-1.10-Fix-test-failure-on-big-endian-architectures.patch @@ -0,0 +1,75 @@ +From 953aa33ab33ca6059f85dc8ebb40c3b6bbaae39c Mon Sep 17 00:00:00 2001 +From: Greg Hurrell +Date: Thu, 14 Aug 2014 07:40:39 -0700 +Subject: [PATCH] Fix (spurious) test failure on big-endian architectures + +Our example includes a int_64_t value (the PDU's length prefix), which +is endian-sensitive and so needs to be asserted using native endianness. + +Fixes: + + https://github.com/wincent/Command-T/issues/101 + https://bugzilla.redhat.com/show_bug.cgi?id=1130079 +--- + spec/command-t/watchman/utils_spec.rb | 45 ++++++++++++++++++++++++----------- + 1 file changed, 31 insertions(+), 14 deletions(-) + +diff --git a/spec/command-t/watchman/utils_spec.rb b/spec/command-t/watchman/utils_spec.rb +index 8f174f7..4bb5c4e 100644 +--- a/spec/command-t/watchman/utils_spec.rb ++++ b/spec/command-t/watchman/utils_spec.rb +@@ -379,20 +379,37 @@ def roundtrip(value) + + it 'generates a correct serialization' do + # in Ruby 1.8, hashes aren't ordered, so two serializations are possible +- expected = [ +- binary( +- "\x00\x01\x06\x49\x00\x00\x00\x00\x00\x00\x00\x00\x03\x03\x02\x03" \ +- "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x0aexpression" \ +- "\x00\x03\x02\x02\x03\x04type\x02\x03\x01f\x02\x03\x06fields\x00" \ +- "\x03\x01\x02\x03\x04name" +- ), +- binary( +- "\x00\x01\x06\x49\x00\x00\x00\x00\x00\x00\x00\x00\x03\x03\x02\x03" \ +- "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x06fields\x00" \ +- "\x03\x01\x02\x03\x04name\x02\x03\x0aexpression\x00\x03\x02\x02" \ +- "\x03\x04type\x02\x03\x01f" +- ) +- ] ++ if little_endian? ++ expected = [ ++ binary( ++ "\x00\x01\x06\x49\x00\x00\x00\x00\x00\x00\x00\x00\x03\x03\x02\x03" \ ++ "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x0a" \ ++ "expression\x00\x03\x02\x02\x03\x04type\x02\x03\x01f\x02\x03\x06" \ ++ "fields\x00\x03\x01\x02\x03\x04name" ++ ), ++ binary( ++ "\x00\x01\x06\x49\x00\x00\x00\x00\x00\x00\x00\x00\x03\x03\x02\x03" \ ++ "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x06fields" \ ++ "\x00\x03\x01\x02\x03\x04name\x02\x03\x0aexpression\x00\x03\x02" \ ++ "\x02\x03\x04type\x02\x03\x01f" ++ ) ++ ] ++ else ++ expected = [ ++ binary( ++ "\x00\x01\x06\x00\x00\x00\x00\x00\x00\x00\x49\x00\x03\x03\x02\x03" \ ++ "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x0a" \ ++ "expression\x00\x03\x02\x02\x03\x04type\x02\x03\x01f\x02\x03\x06" \ ++ "fields\x00\x03\x01\x02\x03\x04name" ++ ), ++ binary( ++ "\x00\x01\x06\x00\x00\x00\x00\x00\x00\x00\x49\x00\x03\x03\x02\x03" \ ++ "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x06fields" \ ++ "\x00\x03\x01\x02\x03\x04name\x02\x03\x0aexpression\x00\x03\x02" \ ++ "\x02\x03\x04type\x02\x03\x01f" ++ ) ++ ] ++ end + expect(expected).to include(described_class.dump(query)) + end + end +-- +2.0.3 + diff --git a/vim-command-t.spec b/vim-command-t.spec index eb950d0..ec40785 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -6,7 +6,7 @@ Name: vim-command-t Version: 1.10 -Release: 1%{?dist} +Release: 3%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -16,6 +16,9 @@ URL: https://wincent.com/products/command-t # git clone git://git.wincent.com/command-t.git && cd command-t/ # git archive 1.10 -o command-t-1.10.tar.gz Source0: command-t-%{version}.tar.gz +# Fix test failure on BE architectures (rhbz#1130079). +# https://github.com/wincent/Command-T/commit/953aa33ab33ca6059f85dc8ebb40c3b6bbaae39c +Patch0: vim-command-t-1.10-Fix-test-failure-on-big-endian-architectures.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 @@ -45,6 +48,8 @@ more weight. %prep %setup -q -c +%patch0 -p1 + %build pushd ./ruby/command-t @@ -101,6 +106,9 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %changelog +* Fri Aug 15 2014 Vít Ondruch - 1.10-3 +- Fix BE arch issues. + * Mon Aug 11 2014 Vít Ondruch - 1.10-1 - Update to Command-T 1.10.