From 32f8ba28eceecb668eae1be8956a14341e5d7439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 3 May 2016 08:14:09 +0200 Subject: [PATCH 01/47] Update to Command-T 3.0.2. --- .gitignore | 1 + sources | 2 +- ...command-t-1.10-support-Rspec-3-style.patch | 46 ------------------- vim-command-t.spec | 30 +++++------- 4 files changed, 14 insertions(+), 65 deletions(-) delete mode 100644 vim-command-t-1.10-support-Rspec-3-style.patch diff --git a/.gitignore b/.gitignore index ea7ed76..1b2be14 100644 --- a/.gitignore +++ b/.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 diff --git a/sources b/sources index fbed601..ba67993 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05bef9a19943f869b6e6fb31bde0bebf command-t-2.0.zip +2f4d086bf1c8b64edeb803c6af46fe8e command-t-3.0.2.zip diff --git a/vim-command-t-1.10-support-Rspec-3-style.patch b/vim-command-t-1.10-support-Rspec-3-style.patch deleted file mode 100644 index 96476a7..0000000 --- a/vim-command-t-1.10-support-Rspec-3-style.patch +++ /dev/null @@ -1,46 +0,0 @@ -From af2f6a55c745c2a3368f6146f1003c709541c813 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -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 - diff --git a/vim-command-t.spec b/vim-command-t.spec index 77c54ca..bce5256 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -7,16 +7,13 @@ %global appdata_dir %{_datadir}/appdata Name: vim-command-t -Version: 2.0 -Release: 2%{?dist} +Version: 3.0.2 +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 -# https://github.com/wincent/command-t/issues/190 -Patch1: vim-command-t-1.10-support-Rspec-3-style.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,8 +44,6 @@ more weight. %prep %setup -q -c -%patch1 -p1 - %build pushd ./ruby/command-t @@ -70,10 +65,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 +73,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: -# CommandT::Matcher#sorted_matches_for provides intuitive results for "artcon" and "articles_controller" -# https://github.com/wincent/command-t/issues/189 -sed -i '/provides intuitive results for "artcon" and "articles_controller"/,/^ end$/ s/^/#/' \ - spec/command-t/matcher_spec.rb - +## Ignore failing test: +## CommandT::Matcher#sorted_matches_for provides intuitive results for "artcon" and "articles_controller" +## https://github.com/wincent/command-t/issues/189 +#sed -i '/provides intuitive results for "artcon" and "articles_controller"/,/^ end$/ s/^/#/' \ +# spec/command-t/matcher_spec.rb +# rspec -Iruby spec %post @@ -99,7 +90,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 +107,9 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %changelog +* Tue May 03 2016 Vít Ondruch - 3.0.2-1 +- Update to Command-T 3.0.2. + * Fri Feb 05 2016 Fedora Release Engineering - 2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 87ef5b1ca5560e3396ed0812b10bb49027348883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 3 May 2016 08:14:09 +0200 Subject: [PATCH 02/47] Relax version check. --- ..._LIB_VERSION-instead-of-RUBY_VERSION.patch | 43 +++++++++++++++++++ vim-command-t.spec | 6 +++ 2 files changed, 49 insertions(+) create mode 100644 vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch diff --git a/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch b/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch new file mode 100644 index 0000000..3da09ab --- /dev/null +++ b/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?= +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 + diff --git a/vim-command-t.spec b/vim-command-t.spec index bce5256..a05c6f4 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -14,6 +14,9 @@ Group: Applications/Editors License: BSD URL: https://wincent.com/products/command-t Source0: http://s3.wincent.com/command-t/releases/command-t-%{version}.zip +# Relax the Command-T version checking. +# https://github.com/wincent/command-t/issues/192 +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 @@ -44,6 +47,8 @@ more weight. %prep %setup -q -c +%patch0 -p1 + %build pushd ./ruby/command-t @@ -109,6 +114,7 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %changelog * Tue May 03 2016 Vít Ondruch - 3.0.2-1 - Update to Command-T 3.0.2. +- Relax version check. * Fri Feb 05 2016 Fedora Release Engineering - 2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 1315e3b76f389a808068d6243b03b1edabf9d561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 3 May 2016 08:14:09 +0200 Subject: [PATCH 03/47] Update to Command-T 3.0.2. --- .gitignore | 1 + sources | 2 +- ...command-t-1.10-support-Rspec-3-style.patch | 46 ------------------- vim-command-t.spec | 30 +++++------- 4 files changed, 14 insertions(+), 65 deletions(-) delete mode 100644 vim-command-t-1.10-support-Rspec-3-style.patch diff --git a/.gitignore b/.gitignore index ea7ed76..1b2be14 100644 --- a/.gitignore +++ b/.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 diff --git a/sources b/sources index fbed601..ba67993 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05bef9a19943f869b6e6fb31bde0bebf command-t-2.0.zip +2f4d086bf1c8b64edeb803c6af46fe8e command-t-3.0.2.zip diff --git a/vim-command-t-1.10-support-Rspec-3-style.patch b/vim-command-t-1.10-support-Rspec-3-style.patch deleted file mode 100644 index 96476a7..0000000 --- a/vim-command-t-1.10-support-Rspec-3-style.patch +++ /dev/null @@ -1,46 +0,0 @@ -From af2f6a55c745c2a3368f6146f1003c709541c813 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -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 - diff --git a/vim-command-t.spec b/vim-command-t.spec index 77c54ca..bce5256 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -7,16 +7,13 @@ %global appdata_dir %{_datadir}/appdata Name: vim-command-t -Version: 2.0 -Release: 2%{?dist} +Version: 3.0.2 +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 -# https://github.com/wincent/command-t/issues/190 -Patch1: vim-command-t-1.10-support-Rspec-3-style.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,8 +44,6 @@ more weight. %prep %setup -q -c -%patch1 -p1 - %build pushd ./ruby/command-t @@ -70,10 +65,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 +73,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: -# CommandT::Matcher#sorted_matches_for provides intuitive results for "artcon" and "articles_controller" -# https://github.com/wincent/command-t/issues/189 -sed -i '/provides intuitive results for "artcon" and "articles_controller"/,/^ end$/ s/^/#/' \ - spec/command-t/matcher_spec.rb - +## Ignore failing test: +## CommandT::Matcher#sorted_matches_for provides intuitive results for "artcon" and "articles_controller" +## https://github.com/wincent/command-t/issues/189 +#sed -i '/provides intuitive results for "artcon" and "articles_controller"/,/^ end$/ s/^/#/' \ +# spec/command-t/matcher_spec.rb +# rspec -Iruby spec %post @@ -99,7 +90,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 +107,9 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %changelog +* Tue May 03 2016 Vít Ondruch - 3.0.2-1 +- Update to Command-T 3.0.2. + * Fri Feb 05 2016 Fedora Release Engineering - 2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From c754e868688ad78cd24073059750f81175940b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 3 May 2016 08:14:09 +0200 Subject: [PATCH 04/47] Relax version check. --- ..._LIB_VERSION-instead-of-RUBY_VERSION.patch | 43 +++++++++++++++++++ vim-command-t.spec | 6 +++ 2 files changed, 49 insertions(+) create mode 100644 vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch diff --git a/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch b/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch new file mode 100644 index 0000000..3da09ab --- /dev/null +++ b/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?= +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 + diff --git a/vim-command-t.spec b/vim-command-t.spec index bce5256..a05c6f4 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -14,6 +14,9 @@ Group: Applications/Editors License: BSD URL: https://wincent.com/products/command-t Source0: http://s3.wincent.com/command-t/releases/command-t-%{version}.zip +# Relax the Command-T version checking. +# https://github.com/wincent/command-t/issues/192 +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 @@ -44,6 +47,8 @@ more weight. %prep %setup -q -c +%patch0 -p1 + %build pushd ./ruby/command-t @@ -109,6 +114,7 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %changelog * Tue May 03 2016 Vít Ondruch - 3.0.2-1 - Update to Command-T 3.0.2. +- Relax version check. * Fri Feb 05 2016 Fedora Release Engineering - 2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 54924f21d5c36ae0e20d1fd54e89e0bff9a7249d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 7 Jun 2016 10:26:11 +0200 Subject: [PATCH 05/47] Update to Command-T 4.0. --- .gitignore | 1 + sources | 2 +- ..._LIB_VERSION-instead-of-RUBY_VERSION.patch | 6 +- vim-command-t.spec | 61 +++++++++---------- 4 files changed, 33 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 1b2be14..7f8b692 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /command-t-1.13.tar.gz /command-t-2.0.zip /command-t-3.0.2.zip +/command-t-4.0.tar.gz diff --git a/sources b/sources index ba67993..8434f45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f4d086bf1c8b64edeb803c6af46fe8e command-t-3.0.2.zip +5e94c0bb1450a9f4e4a9b00423741fa8 command-t-4.0.tar.gz diff --git a/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch b/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch index 3da09ab..60f6b4d 100644 --- a/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch +++ b/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch @@ -12,7 +12,7 @@ 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 +@@ -159,8 +159,7 @@ ruby << EOF # compiled with. patchlevel = defined?(RUBY_PATCHLEVEL) ? RUBY_PATCHLEVEL : nil if CommandT::Metadata::UNKNOWN == true || ( @@ -36,8 +36,8 @@ index 8603dad..643fa6a 100644 - } + EXPECTED_RUBY_LIB_VERSION = #{RbConfig::MAKEFILE_CONFIG['RUBY_LIB_VERSION'].inspect} UNKNOWN = false - end # module Metadata - end # module CommandT + end + end -- 2.8.2 diff --git a/vim-command-t.spec b/vim-command-t.spec index a05c6f4..6d7bb0e 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -1,19 +1,15 @@ -# There is no better way how to obtain the vimfiles folder location :/ -# https://bugzilla.redhat.com/show_bug.cgi?id=844975 -%global vimfiles %{_datadir}/vim/vimfiles - %global commandt_so_dir %{ruby_vendorarchdir}/command-t %global appdata_dir %{_datadir}/appdata Name: vim-command-t -Version: 3.0.2 +Version: 4.0 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 +URL: https://github.com/wincent/command-t +Source0: https://github.com/wincent/command-t/archive/%{version}/command-t-%{version}.tar.gz # Relax the Command-T version checking. # https://github.com/wincent/command-t/issues/192 Patch0: vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch @@ -30,6 +26,8 @@ BuildRequires: ruby-devel BuildRequires: rubygems BuildRequires: rubygem(rspec) >= 3 BuildRequires: rubygem(rr) +# Defines %%vimfiles_root +BuildRequires: vim-filesystem Requires(post): %{_bindir}/vim Requires(postun): %{_bindir}/vim @@ -45,7 +43,7 @@ locations (for example, immediately after a path separator) should be given more weight. %prep -%setup -q -c +%setup -q -n command-t-%{version} %patch0 -p1 @@ -60,15 +58,15 @@ popd %install -mkdir -p %{buildroot}%{vimfiles} -cp -par {autoload,doc,plugin,ruby} %{buildroot}%{vimfiles} +mkdir -p %{buildroot}%{vimfiles_root} +cp -par {autoload,doc,plugin,ruby} %{buildroot}%{vimfiles_root} mkdir -p %{buildroot}%{commandt_so_dir} -chmod 0755 %{buildroot}%{vimfiles}/ruby/command-t/ext.so -mv %{buildroot}%{vimfiles}/ruby/command-t/ext.so %{buildroot}%{commandt_so_dir} +chmod 0755 %{buildroot}%{vimfiles_root}/ruby/command-t/ext.so +mv %{buildroot}%{vimfiles_root}/ruby/command-t/ext.so %{buildroot}%{commandt_so_dir} # Remove all dot files. -find %{buildroot}%{vimfiles} -name '.*' -delete +find %{buildroot}%{vimfiles_root} -name '.*' -delete # Install AppData. mkdir -p %{buildroot}%{appdata_dir} @@ -78,40 +76,37 @@ 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: -## CommandT::Matcher#sorted_matches_for provides intuitive results for "artcon" and "articles_controller" -## https://github.com/wincent/command-t/issues/189 -#sed -i '/provides intuitive results for "artcon" and "articles_controller"/,/^ end$/ s/^/#/' \ -# spec/command-t/matcher_spec.rb -# rspec -Iruby spec %post -vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null +vim -c ":helptags %{vimfiles_root}/doc" -c :q &> /dev/null %postun -> %{vimfiles}/doc/tags -vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null +> %{vimfiles_root}/doc/tags +vim -c ":helptags %{vimfiles_root}/doc" -c :q &> /dev/null %files %license LICENSE %doc README.md %{commandt_so_dir} -%{vimfiles}/autoload/* -%{vimfiles}/doc/* -%{vimfiles}/plugin/* -%exclude %{vimfiles}/ruby/command-t/ext* -%exclude %{vimfiles}/ruby/command-t/*.o -%exclude %{vimfiles}/ruby/command-t/*.h -%exclude %{vimfiles}/ruby/command-t/*.c -%exclude %{vimfiles}/ruby/command-t/Makefile -%exclude %{vimfiles}/ruby/command-t/mkmf.log -%exclude %{vimfiles}/ruby/command-t/depend -%{vimfiles}/ruby +%{vimfiles_root}/autoload/* +%{vimfiles_root}/doc/* +%{vimfiles_root}/plugin/* +%exclude %{vimfiles_root}/ruby/command-t/ext* +%exclude %{vimfiles_root}/ruby/command-t/*.o +%exclude %{vimfiles_root}/ruby/command-t/*.h +%exclude %{vimfiles_root}/ruby/command-t/*.c +%exclude %{vimfiles_root}/ruby/command-t/Makefile +%exclude %{vimfiles_root}/ruby/command-t/mkmf.log +%exclude %{vimfiles_root}/ruby/command-t/depend +%{vimfiles_root}/ruby %{appdata_dir}/vim-command-t.metainfo.xml %changelog +* Tue Jun 07 2016 Vít Ondruch - 4.0-1 +- Update to Command-T 4.0. + * Tue May 03 2016 Vít Ondruch - 3.0.2-1 - Update to Command-T 3.0.2. - Relax version check. From a91b78f43467fbd5b1a8ab4a8e60e369f4de0ce3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 13 Jan 2017 12:41:07 +0900 Subject: [PATCH 06/47] F-26: rebuild for ruby24 --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 6d7bb0e..dda44e5 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -104,6 +104,9 @@ vim -c ":helptags %{vimfiles_root}/doc" -c :q &> /dev/null %changelog +* Fri Jan 13 2017 Mamoru TASAKA - 4.0-2 +- F-26: rebuild for ruby24 + * Tue Jun 07 2016 Vít Ondruch - 4.0-1 - Update to Command-T 4.0. From efdbfbe061602001d99982971a11387c8ba677ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:04:43 +0000 Subject: [PATCH 07/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index dda44e5..f7e66d2 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -104,6 +104,9 @@ vim -c ":helptags %{vimfiles_root}/doc" -c :q &> /dev/null %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jan 13 2017 Mamoru TASAKA - 4.0-2 - F-26: rebuild for ruby24 From 01322c0e207d0dbdbc271b44404b7f896de6dc8d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:19:04 +0000 Subject: [PATCH 08/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index f7e66d2..13d8742 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -104,6 +104,9 @@ vim -c ":helptags %{vimfiles_root}/doc" -c :q &> /dev/null %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 6764db18f28407935e3f5375c642d1f182408825 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:04:26 +0000 Subject: [PATCH 09/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 13d8742..592da37 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -104,6 +104,9 @@ vim -c ":helptags %{vimfiles_root}/doc" -c :q &> /dev/null %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 4.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 579974d9f00b4e3afb07e5d6ed8788e6d9b0acb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 26 Sep 2017 12:53:49 +0200 Subject: [PATCH 10/47] Update to Command-T 5.0.2. --- .gitignore | 1 + sources | 2 +- ..._LIB_VERSION-instead-of-RUBY_VERSION.patch | 12 +++++----- vim-command-t.spec | 22 +++++++------------ 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 7f8b692..dc3e676 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /command-t-2.0.zip /command-t-3.0.2.zip /command-t-4.0.tar.gz +/command-t-5.0.2.tar.gz diff --git a/sources b/sources index 8434f45..f0b8adb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e94c0bb1450a9f4e4a9b00423741fa8 command-t-4.0.tar.gz +SHA512 (command-t-5.0.2.tar.gz) = f8c8356231c3fb0f3a91cb61f534acac4dd401721a940c6ea045ada287d29395923eb46b1cb4f55b8254000f10eea9970841531abb2b110992180a1edbd66b81 diff --git a/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch b/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch index 60f6b4d..279e317 100644 --- a/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch +++ b/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch @@ -4,15 +4,15 @@ 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 +---- + autoload/commandt.vim | 3 +-- + ruby/command-t/ext/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 -@@ -159,8 +159,7 @@ ruby << EOF +@@ -192,8 +192,7 @@ ruby << EOF # compiled with. patchlevel = defined?(RUBY_PATCHLEVEL) ? RUBY_PATCHLEVEL : nil if CommandT::Metadata::UNKNOWN == true || ( @@ -22,10 +22,10 @@ index 7513f55..1299731 100644 ) 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 +diff --git a/ruby/command-t/ext/command-t/extconf.rb b/ruby/command-t/ext/command-t/extconf.rb index 8603dad..643fa6a 100644 ---- a/ruby/command-t/extconf.rb -+++ b/ruby/command-t/extconf.rb +--- a/ruby/command-t/ext/command-t/extconf.rb ++++ b/ruby/command-t/ext/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 diff --git a/vim-command-t.spec b/vim-command-t.spec index 592da37..e857f40 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -3,8 +3,8 @@ %global appdata_dir %{_datadir}/appdata Name: vim-command-t -Version: 4.0 -Release: 5%{?dist} +Version: 5.0.2 +Release: 1%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -28,8 +28,6 @@ BuildRequires: rubygem(rspec) >= 3 BuildRequires: rubygem(rr) # Defines %%vimfiles_root BuildRequires: vim-filesystem -Requires(post): %{_bindir}/vim -Requires(postun): %{_bindir}/vim %description The Command-T plug-in for VIM provides an extremely fast, intuitive mechanism @@ -48,7 +46,7 @@ more weight. %patch0 -p1 %build -pushd ./ruby/command-t +pushd ./ruby/command-t/ext/command-t export CONFIGURE_ARGS="--with-cflags='%{optflags}'" ruby extconf.rb --vendor @@ -62,8 +60,8 @@ mkdir -p %{buildroot}%{vimfiles_root} cp -par {autoload,doc,plugin,ruby} %{buildroot}%{vimfiles_root} mkdir -p %{buildroot}%{commandt_so_dir} -chmod 0755 %{buildroot}%{vimfiles_root}/ruby/command-t/ext.so -mv %{buildroot}%{vimfiles_root}/ruby/command-t/ext.so %{buildroot}%{commandt_so_dir} +chmod 0755 %{buildroot}%{vimfiles_root}/ruby/command-t/ext/command-t/ext.so +mv %{buildroot}%{vimfiles_root}/ruby/command-t/ext/command-t/ext.so %{buildroot}%{commandt_so_dir} # Remove all dot files. find %{buildroot}%{vimfiles_root} -name '.*' -delete @@ -78,13 +76,6 @@ sed -i '/Bundler/,/^end$/ s/^/#/' spec/spec_helper.rb rspec -Iruby spec -%post -vim -c ":helptags %{vimfiles_root}/doc" -c :q &> /dev/null - -%postun -> %{vimfiles_root}/doc/tags -vim -c ":helptags %{vimfiles_root}/doc" -c :q &> /dev/null - %files %license LICENSE %doc README.md @@ -104,6 +95,9 @@ vim -c ":helptags %{vimfiles_root}/doc" -c :q &> /dev/null %changelog +* Tue Sep 26 2017 Vít Ondruch - 5.0.2-1 +- Update to Command-T 5.0.2. + * Thu Aug 03 2017 Fedora Release Engineering - 4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From a069d85bd89ce017eaf1606df01096f939e57971 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 5 Jan 2018 14:11:16 +0900 Subject: [PATCH 11/47] F-28: rebuild for ruby25 --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index e857f40..ff39334 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -95,6 +95,9 @@ rspec -Iruby spec %changelog +* Fri Jan 05 2018 Mamoru TASAKA - 5.0.2-2 +- F-28: rebuild for ruby25 + * Tue Sep 26 2017 Vít Ondruch - 5.0.2-1 - Update to Command-T 5.0.2. From f7e2acd41b0b2cb30bf23d6f81b87c0ae1614211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 20 Jan 2018 23:08:41 +0100 Subject: [PATCH 12/47] Rebuilt for switch to libxcrypt --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index ff39334..668acbc 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -95,6 +95,9 @@ rspec -Iruby spec %changelog +* Sat Jan 20 2018 Björn Esser - 5.0.2-3 +- Rebuilt for switch to libxcrypt + * Fri Jan 05 2018 Mamoru TASAKA - 5.0.2-2 - F-28: rebuild for ruby25 From bdc1e9e392f59096fae9304847e29d108080e400 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:30:13 +0000 Subject: [PATCH 13/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 668acbc..6aa46da 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -95,6 +95,9 @@ rspec -Iruby spec %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 5.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Jan 20 2018 Björn Esser - 5.0.2-3 - Rebuilt for switch to libxcrypt From 45d51a55fac08f61b98a31a9dc75e61e852efe85 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:32:29 +0000 Subject: [PATCH 14/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 6aa46da..20945bc 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -95,6 +95,9 @@ rspec -Iruby spec %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 5.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 5.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From dde059002e612f5095ef0e2065f60087210262c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 27 Jul 2018 14:30:29 +0200 Subject: [PATCH 15/47] Add "BR: gcc" to fix FTBFS (rhbz#1606647). --- vim-command-t.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vim-command-t.spec b/vim-command-t.spec index 20945bc..68b3e1d 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -26,6 +26,7 @@ BuildRequires: ruby-devel BuildRequires: rubygems BuildRequires: rubygem(rspec) >= 3 BuildRequires: rubygem(rr) +BuildRequires: gcc # Defines %%vimfiles_root BuildRequires: vim-filesystem @@ -95,6 +96,9 @@ rspec -Iruby spec %changelog +* Fri Jul 27 2018 Vít Ondruch - 5.0.2-5 +- Add "BR: gcc" to fix FTBFS (rhbz#1606647). + * Sat Jul 14 2018 Fedora Release Engineering - 5.0.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 4a6556449f9f85b86bf8ebe346d72212bcbd6eaa Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 21 Jan 2019 18:29:07 +0900 Subject: [PATCH 16/47] F-30: rebuild against ruby26 --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 68b3e1d..76ff316 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -96,6 +96,9 @@ rspec -Iruby spec %changelog +* Mon Jan 21 2019 Mamoru TASAKA - 5.0.2-6 +- F-30: rebuild against ruby26 + * Fri Jul 27 2018 Vít Ondruch - 5.0.2-5 - Add "BR: gcc" to fix FTBFS (rhbz#1606647). From c29ccef84e66d41d8afa1c22402be555286e1c30 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 17/47] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- vim-command-t.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 76ff316..6b4e889 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -6,7 +6,6 @@ Name: vim-command-t Version: 5.0.2 Release: 6%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM -Group: Applications/Editors License: BSD URL: https://github.com/wincent/command-t Source0: https://github.com/wincent/command-t/archive/%{version}/command-t-%{version}.tar.gz From c97ba26b009d5b69317cbe40e0cdf05d4df1ff45 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:16:58 +0000 Subject: [PATCH 18/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 6b4e889..e3168b7 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -95,6 +95,9 @@ rspec -Iruby spec %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 5.0.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 21 2019 Mamoru TASAKA - 5.0.2-6 - F-30: rebuild against ruby26 From d7162d27efac8549233d8a8d62d25e1ba642a644 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:59:06 +0000 Subject: [PATCH 19/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index e3168b7..992d5a0 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -95,6 +95,9 @@ rspec -Iruby spec %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 5.0.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 5.0.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 8e8b43bd389f6a9faa507ab2a0b44b62d5258f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 17 Jan 2020 15:37:36 +0100 Subject: [PATCH 20/47] Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.7 --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 992d5a0..72fd5bb 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -95,6 +95,9 @@ rspec -Iruby spec %changelog +* Fri Jan 17 2020 Vít Ondruch - 5.0.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.7 + * Sat Jul 27 2019 Fedora Release Engineering - 5.0.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 574fa9f3ee8675daf094f8b1bf20f47a44ffd4e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:08:58 +0000 Subject: [PATCH 21/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 72fd5bb..31dd1ed 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -95,6 +95,9 @@ rspec -Iruby spec %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 5.0.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 17 2020 Vít Ondruch - 5.0.2-9 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.7 From c40e8e08b7bcaa232728317161966e351d0fc551 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:42:31 +0000 Subject: [PATCH 22/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 31dd1ed..7e28fef 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -95,6 +95,9 @@ rspec -Iruby spec %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 5.0.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 5.0.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From a15221de2d1246fdb97679b03a2c7bcdbb375e93 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 Jan 2021 20:24:30 +0900 Subject: [PATCH 23/47] F-34: rebuild against ruby 3.0 --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 7e28fef..9554e07 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -95,6 +95,9 @@ rspec -Iruby spec %changelog +* Wed Jan 06 2021 Mamoru TASAKA - 5.0.2-12 +- F-34: rebuild against ruby 3.0 + * Wed Jul 29 2020 Fedora Release Engineering - 5.0.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 307a7bad01d9dc3f61a36e8fc917cc3f3907099a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:42:31 +0000 Subject: [PATCH 24/47] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- vim-command-t.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vim-command-t.spec b/vim-command-t.spec index 9554e07..bc6c5ea 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -20,6 +20,7 @@ Requires: ruby(release) # support some conditional requires. Requires: ruby(rubygems) Requires: vim-common +BuildRequires: make BuildRequires: ruby(release) BuildRequires: ruby-devel BuildRequires: rubygems From 4acc086f6063f6074fa4665d242278ca7a4fc8ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:03:56 +0000 Subject: [PATCH 25/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index bc6c5ea..67fd667 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -96,6 +96,9 @@ rspec -Iruby spec %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 5.0.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 06 2021 Mamoru TASAKA - 5.0.2-12 - F-34: rebuild against ruby 3.0 From beda3c53297fa77ecba0aea1594b76ef1ad3e4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 4 Mar 2021 20:48:16 +0100 Subject: [PATCH 26/47] Update to Command-T 5.0.3. Resolves: rhbz#1631111 --- .gitignore | 1 + sources | 2 +- ...-t-5.0.3-Use-rspec-mock-for-stubbing.patch | 243 ++++++++++++++++++ vim-command-t-5.0.3-fix-tests.patch | 63 +++++ vim-command-t.spec | 17 +- 5 files changed, 322 insertions(+), 4 deletions(-) create mode 100644 vim-command-t-5.0.3-Use-rspec-mock-for-stubbing.patch create mode 100644 vim-command-t-5.0.3-fix-tests.patch diff --git a/.gitignore b/.gitignore index dc3e676..3ee6ea3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /command-t-3.0.2.zip /command-t-4.0.tar.gz /command-t-5.0.2.tar.gz +/command-t-5.0.3.tar.gz diff --git a/sources b/sources index f0b8adb..89ecd76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (command-t-5.0.2.tar.gz) = f8c8356231c3fb0f3a91cb61f534acac4dd401721a940c6ea045ada287d29395923eb46b1cb4f55b8254000f10eea9970841531abb2b110992180a1edbd66b81 +SHA512 (command-t-5.0.3.tar.gz) = 588ee1516039e6cd45210de43307c02259fed29cc7610c222fe705cdf1d5938f51f823d41b546a36320da31db12e902363867da91b18fe56ea09c1efe2bb51fb diff --git a/vim-command-t-5.0.3-Use-rspec-mock-for-stubbing.patch b/vim-command-t-5.0.3-Use-rspec-mock-for-stubbing.patch new file mode 100644 index 0000000..a76464c --- /dev/null +++ b/vim-command-t-5.0.3-Use-rspec-mock-for-stubbing.patch @@ -0,0 +1,243 @@ +From a185ccc2f4483f01edd80432b3daebdebdb15a7f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADt=20Ondruch?= +Date: Thu, 4 Mar 2021 13:53:36 +0100 +Subject: [PATCH] Use rspec-mock for stubbing. + +This allows to remove `rr` dependency and therefore reduce dependency +chain. +--- + spec/command-t/controller_spec.rb | 72 +++++++++---------- + spec/command-t/finder/buffer_finder_spec.rb | 2 +- + spec/command-t/finder/file_finder_spec.rb | 6 +- + spec/command-t/scanner/buffer_scanner_spec.rb | 6 +- + .../file_scanner/ruby_file_scanner_spec.rb | 8 +-- + .../watchman_file_scanner_spec.rb | 6 +- + spec/spec_helper.rb | 4 -- + 7 files changed, 49 insertions(+), 55 deletions(-) + +diff --git a/spec/command-t/controller_spec.rb b/spec/command-t/controller_spec.rb +index 3a3fcaf..6bbd6d7 100644 +--- a/spec/command-t/controller_spec.rb ++++ b/spec/command-t/controller_spec.rb +@@ -16,35 +16,35 @@ describe CommandT::Controller do + end + + def set_string(name, value) +- stub(::VIM).evaluate(%{exists("#{name}")}).returns(1) +- stub(::VIM).evaluate(name).returns(value) ++ allow(::VIM).to receive(:evaluate).with(%{exists("#{name}")}).and_return(1) ++ allow(::VIM).to receive(:evaluate).with(name).and_return(value) + end + + it 'opens relative paths inside the working directory' do +- stub(::VIM).evaluate('a:arg').returns('') ++ allow(::VIM).to receive(:evaluate).with('a:arg').and_return('') + set_string('g:CommandTTraverseSCM', 'pwd') + controller.show_file_finder +- mock(::VIM).command('silent CommandTOpen edit path/to/selection') ++ expect(::VIM).to receive(:command).with('silent CommandTOpen edit path/to/selection') + controller.accept_selection + end + + it 'opens absolute paths outside the working directory' do +- stub(::VIM).evaluate('a:arg').returns('../outside') ++ allow(::VIM).to receive(:evaluate).with('a:arg').and_return('../outside') + controller.show_file_finder +- mock(::VIM).command('silent CommandTOpen edit /working/outside/path/to/selection') ++ expect(::VIM).to receive(:command).with('silent CommandTOpen edit /working/outside/path/to/selection') + controller.accept_selection + end + + it 'does not get confused by common directory prefixes' do +- stub(::VIM).evaluate('a:arg').returns('../directory-oops') ++ allow(::VIM).to receive(:evaluate).with('a:arg').and_return('../directory-oops') + controller.show_file_finder +- mock(::VIM).command('silent CommandTOpen edit /working/directory-oops/path/to/selection') ++ expect(::VIM).to receive(:command).with('silent CommandTOpen edit /working/directory-oops/path/to/selection') + controller.accept_selection + end + + it 'does not enter an infinite loop when toggling focus' do + # https://github.com/wincent/command-t/issues/157 +- stub(::VIM).evaluate('a:arg').returns('') ++ allow(::VIM).to receive(:evaluate).with('a:arg').and_return('') + set_string('g:CommandTTraverseSCM', 'pwd') + controller.show_file_finder + expect { controller.toggle_focus }.to_not raise_error +@@ -59,43 +59,43 @@ describe CommandT::Controller do + + def stub_finder(sorted_matches=[]) + finder = CommandT::Finder::FileFinder.new +- stub(finder).path = anything +- stub(finder).sorted_matches_for(anything, anything).returns(sorted_matches) +- stub(CommandT::Finder::FileFinder).new.returns(finder) ++ allow(finder).to receive(:"path=").with(anything) ++ allow(finder).to receive(:sorted_matches_for).with(anything, anything).and_return(sorted_matches) ++ allow(CommandT::Finder::FileFinder).to receive(:new).and_return(finder) + end + + def stub_match_window(selection) + match_window = Object.new +- stub(match_window).matches = anything +- stub(match_window).leave +- stub(match_window).focus +- stub(match_window).selection.returns(selection) +- stub(CommandT::MatchWindow).new.returns(match_window) ++ allow(match_window).to receive(:"matches=").with(anything) ++ allow(match_window).to receive(:leave) ++ allow(match_window).to receive(:focus) ++ allow(match_window).to receive(:selection).and_return(selection) ++ allow(CommandT::MatchWindow).to receive(:new).and_return(match_window) + end + + def stub_prompt(abbrev='') + prompt = Object.new +- stub(prompt).focus +- stub(prompt).unfocus +- stub(prompt).clear! +- stub(prompt).redraw +- stub(prompt).abbrev.returns(abbrev) +- stub(CommandT::Prompt).new.returns(prompt) ++ allow(prompt).to receive(:focus) ++ allow(prompt).to receive(:unfocus) ++ allow(prompt).to receive(:clear!) ++ allow(prompt).to receive(:redraw) ++ allow(prompt).to receive(:abbrev).and_return(abbrev) ++ allow(CommandT::Prompt).to receive(:new).and_return(prompt) + end + + def stub_vim(working_directory) +- stub($curbuf).number.returns('0') +- stub(::VIM).command(/noremap/) +- stub(::VIM).command('silent b 0') +- stub(::VIM).command(/augroup/) +- stub(::VIM).command('au!') +- stub(::VIM).command(/autocmd/) +- stub(::VIM).evaluate(/exists\(.+\)/).returns('0') +- stub(::VIM).evaluate('getcwd()').returns(working_directory) +- stub(::VIM).evaluate('&buflisted').returns('1') +- stub(::VIM).evaluate('&lines').returns('80') +- stub(::VIM).evaluate('&term').returns('vt100') +- stub(::VIM).evaluate('v:version').returns(704) +- stub(::VIM).evaluate('!&buflisted && &buftype == "nofile"') ++ allow($curbuf).to receive(:number).and_return('0') ++ allow(::VIM).to receive(:command).with(/noremap/) ++ allow(::VIM).to receive(:command).with('silent b 0') ++ allow(::VIM).to receive(:command).with(/augroup/) ++ allow(::VIM).to receive(:command).with('au!') ++ allow(::VIM).to receive(:command).with(/autocmd/) ++ allow(::VIM).to receive(:evaluate).with(/exists\(.+\)/).and_return('0') ++ allow(::VIM).to receive(:evaluate).with('getcwd()').and_return(working_directory) ++ allow(::VIM).to receive(:evaluate).with('&buflisted').and_return('1') ++ allow(::VIM).to receive(:evaluate).with('&lines').and_return('80') ++ allow(::VIM).to receive(:evaluate).with('&term').and_return('vt100') ++ allow(::VIM).to receive(:evaluate).with('v:version').and_return(704) ++ allow(::VIM).to receive(:evaluate).with('!&buflisted && &buftype == "nofile"') + end + end +diff --git a/spec/command-t/finder/buffer_finder_spec.rb b/spec/command-t/finder/buffer_finder_spec.rb +index f0df4e1..be56463 100644 +--- a/spec/command-t/finder/buffer_finder_spec.rb ++++ b/spec/command-t/finder/buffer_finder_spec.rb +@@ -6,7 +6,7 @@ require 'spec_helper' + describe CommandT::Finder::BufferFinder do + before do + @paths = %w(.git/config .vim/notes .vimrc baz foo/beta) +- any_instance_of(CommandT::Scanner::BufferScanner, :paths => @paths) ++ allow_any_instance_of(CommandT::Scanner::BufferScanner).to receive(:paths).and_return(@paths) + @finder = CommandT::Finder::BufferFinder.new + end + +diff --git a/spec/command-t/finder/file_finder_spec.rb b/spec/command-t/finder/file_finder_spec.rb +index cac5388..9654105 100644 +--- a/spec/command-t/finder/file_finder_spec.rb ++++ b/spec/command-t/finder/file_finder_spec.rb +@@ -19,9 +19,9 @@ describe CommandT::Finder::FileFinder do + end + + before do +- stub(::VIM).evaluate(/expand/) { 0 } +- stub(::VIM).command(/echon/) +- stub(::VIM).command('redraw') ++ allow(::VIM).to receive(:evaluate).with(/expand/) { 0 } ++ allow(::VIM).to receive(:command).with(/echon/) ++ allow(::VIM).to receive(:command).with('redraw') + end + + describe 'sorted_matches_for method' do +diff --git a/spec/command-t/scanner/buffer_scanner_spec.rb b/spec/command-t/scanner/buffer_scanner_spec.rb +index acc3b7e..a4ade60 100644 +--- a/spec/command-t/scanner/buffer_scanner_spec.rb ++++ b/spec/command-t/scanner/buffer_scanner_spec.rb +@@ -14,10 +14,10 @@ describe CommandT::Scanner::BufferScanner do + before do + @paths = %w(bar/abc bar/xyz baz bing foo/alpha/t1 foo/alpha/t2 foo/beta) + @scanner = CommandT::Scanner::BufferScanner.new +- stub(@scanner).relative_path_under_working_directory(is_a(String)) { |arg| arg } +- stub(::VIM::Buffer).count { 7 } ++ allow(@scanner).to receive(:relative_path_under_working_directory).with(kind_of(String)) { |arg| arg } ++ allow(::VIM::Buffer).to receive(:count) { 7 } + (0..6).each do |n| +- stub(::VIM::Buffer)[n].returns(buffer @paths[n]) ++ allow(::VIM::Buffer).to receive(:'[]').with(n).and_return(buffer @paths[n]) + end + end + +diff --git a/spec/command-t/scanner/file_scanner/ruby_file_scanner_spec.rb b/spec/command-t/scanner/file_scanner/ruby_file_scanner_spec.rb +index 10f0e22..3d60c2e 100644 +--- a/spec/command-t/scanner/file_scanner/ruby_file_scanner_spec.rb ++++ b/spec/command-t/scanner/file_scanner/ruby_file_scanner_spec.rb +@@ -11,10 +11,10 @@ describe CommandT::Scanner::FileScanner::RubyFileScanner do + ) + @scanner = CommandT::Scanner::FileScanner::RubyFileScanner.new(@dir) + +- stub(::VIM).evaluate(/exists/) { 1 } +- stub(::VIM).evaluate(/expand\(.+\)/) { '0' } +- stub(::VIM).command(/echon/) +- stub(::VIM).command('redraw') ++ allow(::VIM).to receive(:evaluate).with(/exists/) { 1 } ++ allow(::VIM).to receive(:evaluate).with(/expand\(.+\)/) { '0' } ++ allow(::VIM).to receive(:command).with(/echon/) ++ allow(::VIM).to receive(:command).with('redraw') + end + + describe 'paths method' do +diff --git a/spec/command-t/scanner/file_scanner/watchman_file_scanner_spec.rb b/spec/command-t/scanner/file_scanner/watchman_file_scanner_spec.rb +index f6ec70d..ffad09e 100644 +--- a/spec/command-t/scanner/file_scanner/watchman_file_scanner_spec.rb ++++ b/spec/command-t/scanner/file_scanner/watchman_file_scanner_spec.rb +@@ -8,14 +8,12 @@ describe CommandT::Scanner::FileScanner::WatchmanFileScanner do + it 'falls back to the FindFileScanner' do + # fake an error + scanner = described_class.new +- stub(scanner).get_raw_sockname do ++ allow(scanner).to receive(:get_raw_sockname) do + raise described_class::WatchmanError + end + + # expect call on superclass +- any_instance_of(CommandT::Scanner::FileScanner::FindFileScanner) do |klass| +- mock(klass).paths! +- end ++ expect_any_instance_of(CommandT::Scanner::FileScanner::FindFileScanner).to receive(:paths!) + + scanner.paths! + end +diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb +index 2775956..370d46c 100644 +--- a/spec/spec_helper.rb ++++ b/spec/spec_helper.rb +@@ -16,10 +16,6 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) + require 'command-t' + require 'command-t/ext' + +-RSpec.configure do |config| +- config.mock_framework = :rr +-end +- + # Fake top-level VIM implementation, for stubbing. + module VIM + class << self +-- +2.30.0 + diff --git a/vim-command-t-5.0.3-fix-tests.patch b/vim-command-t-5.0.3-fix-tests.patch new file mode 100644 index 0000000..229ed12 --- /dev/null +++ b/vim-command-t-5.0.3-fix-tests.patch @@ -0,0 +1,63 @@ +From 52adb808e2db85035e9a5a214cb147280c2f10e0 Mon Sep 17 00:00:00 2001 +From: Greg Hurrell +Date: Thu, 4 Mar 2021 19:20:43 +0100 +Subject: [PATCH] test: fix tests + +These are all probably very sensitive to environment (Ruby version etc), +and I haven't run them for a while, so just doing a duct-tape and +chicken-wire kind of fix to get everything green on my system. + +Note that I "defanged" the BufferScanner tests which were failing and +were too complicated (too many mocks, so it is hard to be sure that they +verified anything at all) by effectively turning them into a +blinking-light demo that doesn't really do much. + +With these changes: + + Finished in 0.10298 seconds (files took 0.11239 seconds to load) + 121 examples, 0 failures, 1 pending +--- + spec/command-t/controller_spec.rb | 3 +++ + spec/command-t/scanner/buffer_scanner_spec.rb | 12 +----------- + 2 files changed, 4 insertions(+), 11 deletions(-) + +diff --git a/spec/command-t/controller_spec.rb b/spec/command-t/controller_spec.rb +index 6bbd6d78..70751c82 100644 +--- a/spec/command-t/controller_spec.rb ++++ b/spec/command-t/controller_spec.rb +@@ -95,6 +95,9 @@ def stub_vim(working_directory) + allow(::VIM).to receive(:evaluate).with('&buflisted').and_return('1') + allow(::VIM).to receive(:evaluate).with('&lines').and_return('80') + allow(::VIM).to receive(:evaluate).with('&term').and_return('vt100') ++ allow(::VIM).to receive(:evaluate).with("fnameescape('#{working_directory}-oops/path/to/selection')").and_return("#{working_directory}-oops/path/to/selection") ++ allow(::VIM).to receive(:evaluate).with("fnameescape('path/to/selection')").and_return('path/to/selection') ++ allow(::VIM).to receive(:evaluate).with("fnameescape('/working/outside/path/to/selection')").and_return('/working/outside/path/to/selection') + allow(::VIM).to receive(:evaluate).with('v:version').and_return(704) + allow(::VIM).to receive(:evaluate).with('!&buflisted && &buftype == "nofile"') + end +diff --git a/spec/command-t/scanner/buffer_scanner_spec.rb b/spec/command-t/scanner/buffer_scanner_spec.rb +index a4ade60c..d8a014a8 100644 +--- a/spec/command-t/scanner/buffer_scanner_spec.rb ++++ b/spec/command-t/scanner/buffer_scanner_spec.rb +@@ -5,20 +5,10 @@ + require 'ostruct' + + describe CommandT::Scanner::BufferScanner do +- def buffer(name) +- b = OpenStruct.new +- b.name = name +- b +- end +- + before do + @paths = %w(bar/abc bar/xyz baz bing foo/alpha/t1 foo/alpha/t2 foo/beta) + @scanner = CommandT::Scanner::BufferScanner.new +- allow(@scanner).to receive(:relative_path_under_working_directory).with(kind_of(String)) { |arg| arg } +- allow(::VIM::Buffer).to receive(:count) { 7 } +- (0..6).each do |n| +- allow(::VIM::Buffer).to receive(:'[]').with(n).and_return(buffer @paths[n]) +- end ++ allow(@scanner).to receive(:paths!).and_return(@paths) + end + + describe 'paths method' do diff --git a/vim-command-t.spec b/vim-command-t.spec index 67fd667..0f49d73 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -3,8 +3,8 @@ %global appdata_dir %{_datadir}/appdata Name: vim-command-t -Version: 5.0.2 -Release: 13%{?dist} +Version: 5.0.3 +Release: 1%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -12,6 +12,12 @@ Source0: https://github.com/wincent/command-t/archive/%{version}/command-t-%{ver # Relax the Command-T version checking. # https://github.com/wincent/command-t/issues/192 Patch0: vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch +# Use rspec-mock for stubbing to fix the build failures with RR 1.2+. +# https://github.com/wincent/command-t/pull/375 +Patch1: vim-command-t-5.0.3-Use-rspec-mock-for-stubbing.patch +# Fix `CommandT::Scanner::BufferScanner` test. +# https://github.com/wincent/command-t/commit/52adb808e2db85035e9a5a214cb147280c2f10e0 +Patch2: vim-command-t-5.0.3-fix-tests.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 @@ -25,7 +31,6 @@ BuildRequires: ruby(release) BuildRequires: ruby-devel BuildRequires: rubygems BuildRequires: rubygem(rspec) >= 3 -BuildRequires: rubygem(rr) BuildRequires: gcc # Defines %%vimfiles_root BuildRequires: vim-filesystem @@ -45,6 +50,8 @@ more weight. %setup -q -n command-t-%{version} %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build pushd ./ruby/command-t/ext/command-t @@ -96,6 +103,10 @@ rspec -Iruby spec %changelog +* Thu Mar 04 2021 Vít Ondruch - 5.0.3-1 +- Update to Command-T 5.0.3. + Resolves: rhbz#1631111 + * Wed Jan 27 2021 Fedora Release Engineering - 5.0.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d2f8b82efd9847b90b4f948c9aa3469cf557c527 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:28:07 +0000 Subject: [PATCH 27/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 0f49d73..a175243 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -103,6 +103,9 @@ rspec -Iruby spec %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 5.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Mar 04 2021 Vít Ondruch - 5.0.3-1 - Update to Command-T 5.0.3. Resolves: rhbz#1631111 From a8964b2f6dabd38c086e433569bb62c2a2336740 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:58:22 +0000 Subject: [PATCH 28/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index a175243..9cef044 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -103,6 +103,9 @@ rspec -Iruby spec %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 5.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 5.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 79f802d2c0ad56f1c1c6f6a549a5bfa78caa68d7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Jan 2022 08:38:52 +0900 Subject: [PATCH 29/47] F-36: rebuild against ruby31 --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 9cef044..67b9df9 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -103,6 +103,9 @@ rspec -Iruby spec %changelog +* Wed Jan 26 2022 Mamoru TASAKA - 5.0.3-4 +- F-36: rebuild against ruby31 + * Sat Jan 22 2022 Fedora Release Engineering - 5.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 5d2210b1a3e9160fc67ec7382dc524f7cf95c454 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:52:51 +0000 Subject: [PATCH 30/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 67b9df9..c6d637e 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -103,6 +103,9 @@ rspec -Iruby spec %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 5.0.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 26 2022 Mamoru TASAKA - 5.0.3-4 - F-36: rebuild against ruby31 From e2f7f66542bcb634f553577aca8ab58971aa498f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 23 Nov 2022 16:21:59 +0900 Subject: [PATCH 31/47] Patch from upstream for ruby3.2 Fixnum removal --- ...ommand-t-5.0.3-ruby32-Fixnum-removal.patch | 47 +++++++++++++++++++ vim-command-t.spec | 9 +++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 vim-command-t-5.0.3-ruby32-Fixnum-removal.patch diff --git a/vim-command-t-5.0.3-ruby32-Fixnum-removal.patch b/vim-command-t-5.0.3-ruby32-Fixnum-removal.patch new file mode 100644 index 0000000..2cbf93b --- /dev/null +++ b/vim-command-t-5.0.3-ruby32-Fixnum-removal.patch @@ -0,0 +1,47 @@ +From 5147a93a4b6cdb60cfa0ed1b792de711f44cd7b4 Mon Sep 17 00:00:00 2001 +From: Greg Hurrell +Date: Fri, 26 Aug 2022 23:59:38 +0200 +Subject: [PATCH] test: avoid another deprecation warning + + spec/command-t/watchman/utils_spec.rb:17: warning: constant + ::Fixnum is deprecated + +According to: + + https://bugs.ruby-lang.org/issues/12005 + +> CRuby has two Integer classes, Fixnum and Bignum. +> But it is implementation detail. +> They should be seen as a single class Integer + +Unification happened in Ruby 2.4.0, which is approximately $zillion +years ago (well, 25 Dec 2016): + + https://www.ruby-lang.org/en/news/2016/12/25/ruby-2-4-0-released/ + +I doubt anybody running these tests is on such an old version at this +point, so it seems safe to switch to `Integer`. + +Removed the comments because I am not certain whether we're going to hit +that first `if` branch's body any more, and I'd rather have no comments +than something inaccurate or misleading. +--- + spec/command-t/watchman/utils_spec.rb | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/spec/command-t/watchman/utils_spec.rb b/spec/command-t/watchman/utils_spec.rb +index 271589b6..6bfd0d0d 100644 +--- a/spec/command-t/watchman/utils_spec.rb ++++ b/spec/command-t/watchman/utils_spec.rb +@@ -14,9 +14,9 @@ def binary(str) + + def little_endian? + byte = [0xff00].pack('s')[0] +- if byte.is_a?(Fixnum) # ie. Ruby 1.8 ++ if byte.is_a?(Integer) + byte.zero? +- elsif byte.is_a?(String) # ie. Ruby >= 1.9 ++ elsif byte.is_a?(String) + byte == "\x00" + else + raise 'unable to determine endianness' diff --git a/vim-command-t.spec b/vim-command-t.spec index c6d637e..08db21e 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -18,6 +18,9 @@ Patch1: vim-command-t-5.0.3-Use-rspec-mock-for-stubbing.patch # Fix `CommandT::Scanner::BufferScanner` test. # https://github.com/wincent/command-t/commit/52adb808e2db85035e9a5a214cb147280c2f10e0 Patch2: vim-command-t-5.0.3-fix-tests.patch +# https://github.com/wincent/command-t/commit/5147a93a4b6cdb60cfa0ed1b792de711f44cd7b4 +# Ruby3.2 finally removes Fixnum +Patch3: vim-command-t-5.0.3-ruby32-Fixnum-removal.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 @@ -52,6 +55,7 @@ more weight. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build pushd ./ruby/command-t/ext/command-t @@ -103,6 +107,9 @@ rspec -Iruby spec %changelog +* Wed Nov 23 2022 Mamoru TASAKA - 5.0.3-6 +- Patch from upstream for ruby3.2 Fixnum removal + * Sat Jul 23 2022 Fedora Release Engineering - 5.0.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From bf3f72eca3141e72792062f2a86c17dcac4be542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 3 Jan 2023 18:47:07 +0100 Subject: [PATCH 32/47] Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.2 --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 08db21e..ac153d9 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -107,6 +107,9 @@ rspec -Iruby spec %changelog +* Tue Jan 03 2023 Vít Ondruch - 5.0.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.2 + * Wed Nov 23 2022 Mamoru TASAKA - 5.0.3-6 - Patch from upstream for ruby3.2 Fixnum removal From 8ce3b142ed00730ba424f343fbb90315ca157845 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:17:42 +0000 Subject: [PATCH 33/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index ac153d9..74f8f4f 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -107,6 +107,9 @@ rspec -Iruby spec %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 5.0.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 03 2023 Vít Ondruch - 5.0.3-7 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.2 From 5596549d30fc18f746a8cf32fbf50846aff5c302 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:38:13 +0000 Subject: [PATCH 34/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 74f8f4f..9d11c7b 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -107,6 +107,9 @@ rspec -Iruby spec %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 5.0.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 5.0.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From b46617fd6efb95e02f52cf53b619f4ad0d3c1a19 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 4 Jan 2024 00:16:49 +0900 Subject: [PATCH 35/47] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 9d11c7b..782da70 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -107,6 +107,9 @@ rspec -Iruby spec %changelog +* Wed Jan 03 2024 Mamoru TASAKA - 5.0.3-10 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 + * Sat Jul 22 2023 Fedora Release Engineering - 5.0.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 34f614b91e1d5ca698b7e6b7af8c975bb4b1033a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:46:37 +0000 Subject: [PATCH 36/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 782da70..765abc2 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -107,6 +107,9 @@ rspec -Iruby spec %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 5.0.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jan 03 2024 Mamoru TASAKA - 5.0.3-10 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 From fb30028a99c882574c5585ae13c6a9efaa5c0ab5 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:47:07 +0200 Subject: [PATCH 37/47] Eliminate use of obsolete %patchN syntax (#2283636) --- vim-command-t.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 765abc2..57f0074 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -52,10 +52,10 @@ more weight. %prep %setup -q -n command-t-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch 0 -p1 +%patch 1 -p1 +%patch 2 -p1 +%patch 3 -p1 %build pushd ./ruby/command-t/ext/command-t From 3d027a4aa883825a87e8be9b292903dc61dd9d85 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:46:53 +0000 Subject: [PATCH 38/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 57f0074..927f6e7 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,7 +4,7 @@ Name: vim-command-t Version: 5.0.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD URL: https://github.com/wincent/command-t @@ -107,6 +107,9 @@ rspec -Iruby spec %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 5.0.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 5.0.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 25170e41ab388aae1ea3440f14e66e296d44eb7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:39:46 +0200 Subject: [PATCH 39/47] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- vim-command-t.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 927f6e7..af21424 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,9 +4,10 @@ Name: vim-command-t Version: 5.0.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: https://github.com/wincent/command-t Source0: https://github.com/wincent/command-t/archive/%{version}/command-t-%{version}.tar.gz # Relax the Command-T version checking. @@ -107,6 +108,9 @@ rspec -Iruby spec %changelog +* Wed Sep 04 2024 Miroslav Suchý - 5.0.3-13 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 5.0.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From dd4eccc26595f50be6949337962fc26d4b4205be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 14 Oct 2024 15:25:47 +0200 Subject: [PATCH 40/47] Update to Command-T 5.0.5. Resolves: rhbz#2091276 --- .gitignore | 1 + sources | 2 +- ..._LIB_VERSION-instead-of-RUBY_VERSION.patch | 2 +- ...-t-5.0.3-Use-rspec-mock-for-stubbing.patch | 243 ------------------ vim-command-t-5.0.3-fix-tests.patch | 63 ----- ...PDX-identifier-in-AppStream-metadata.patch | 22 ++ vim-command-t.spec | 52 ++-- 7 files changed, 54 insertions(+), 331 deletions(-) delete mode 100644 vim-command-t-5.0.3-Use-rspec-mock-for-stubbing.patch delete mode 100644 vim-command-t-5.0.3-fix-tests.patch create mode 100644 vim-command-t-5.0.5-Use-SPDX-identifier-in-AppStream-metadata.patch diff --git a/.gitignore b/.gitignore index 3ee6ea3..1b2b182 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /command-t-4.0.tar.gz /command-t-5.0.2.tar.gz /command-t-5.0.3.tar.gz +/command-t-5.0.5.tar.gz diff --git a/sources b/sources index 89ecd76..93b910a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (command-t-5.0.3.tar.gz) = 588ee1516039e6cd45210de43307c02259fed29cc7610c222fe705cdf1d5938f51f823d41b546a36320da31db12e902363867da91b18fe56ea09c1efe2bb51fb +SHA512 (command-t-5.0.5.tar.gz) = 300ecdc821c8554c3fd47940f28629644192bf5bb4e7c89a65021e271e526b7738a2eb54f5845af74c7879256ff69409f665dc158db502a2943ec4d36618a9d7 diff --git a/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch b/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch index 279e317..4d3a964 100644 --- a/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch +++ b/vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch @@ -12,7 +12,7 @@ diff --git a/autoload/commandt.vim b/autoload/commandt.vim index 7513f55..1299731 100644 --- a/autoload/commandt.vim +++ b/autoload/commandt.vim -@@ -192,8 +192,7 @@ ruby << EOF +@@ -200,8 +200,7 @@ ruby << EOF # compiled with. patchlevel = defined?(RUBY_PATCHLEVEL) ? RUBY_PATCHLEVEL : nil if CommandT::Metadata::UNKNOWN == true || ( diff --git a/vim-command-t-5.0.3-Use-rspec-mock-for-stubbing.patch b/vim-command-t-5.0.3-Use-rspec-mock-for-stubbing.patch deleted file mode 100644 index a76464c..0000000 --- a/vim-command-t-5.0.3-Use-rspec-mock-for-stubbing.patch +++ /dev/null @@ -1,243 +0,0 @@ -From a185ccc2f4483f01edd80432b3daebdebdb15a7f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADt=20Ondruch?= -Date: Thu, 4 Mar 2021 13:53:36 +0100 -Subject: [PATCH] Use rspec-mock for stubbing. - -This allows to remove `rr` dependency and therefore reduce dependency -chain. ---- - spec/command-t/controller_spec.rb | 72 +++++++++---------- - spec/command-t/finder/buffer_finder_spec.rb | 2 +- - spec/command-t/finder/file_finder_spec.rb | 6 +- - spec/command-t/scanner/buffer_scanner_spec.rb | 6 +- - .../file_scanner/ruby_file_scanner_spec.rb | 8 +-- - .../watchman_file_scanner_spec.rb | 6 +- - spec/spec_helper.rb | 4 -- - 7 files changed, 49 insertions(+), 55 deletions(-) - -diff --git a/spec/command-t/controller_spec.rb b/spec/command-t/controller_spec.rb -index 3a3fcaf..6bbd6d7 100644 ---- a/spec/command-t/controller_spec.rb -+++ b/spec/command-t/controller_spec.rb -@@ -16,35 +16,35 @@ describe CommandT::Controller do - end - - def set_string(name, value) -- stub(::VIM).evaluate(%{exists("#{name}")}).returns(1) -- stub(::VIM).evaluate(name).returns(value) -+ allow(::VIM).to receive(:evaluate).with(%{exists("#{name}")}).and_return(1) -+ allow(::VIM).to receive(:evaluate).with(name).and_return(value) - end - - it 'opens relative paths inside the working directory' do -- stub(::VIM).evaluate('a:arg').returns('') -+ allow(::VIM).to receive(:evaluate).with('a:arg').and_return('') - set_string('g:CommandTTraverseSCM', 'pwd') - controller.show_file_finder -- mock(::VIM).command('silent CommandTOpen edit path/to/selection') -+ expect(::VIM).to receive(:command).with('silent CommandTOpen edit path/to/selection') - controller.accept_selection - end - - it 'opens absolute paths outside the working directory' do -- stub(::VIM).evaluate('a:arg').returns('../outside') -+ allow(::VIM).to receive(:evaluate).with('a:arg').and_return('../outside') - controller.show_file_finder -- mock(::VIM).command('silent CommandTOpen edit /working/outside/path/to/selection') -+ expect(::VIM).to receive(:command).with('silent CommandTOpen edit /working/outside/path/to/selection') - controller.accept_selection - end - - it 'does not get confused by common directory prefixes' do -- stub(::VIM).evaluate('a:arg').returns('../directory-oops') -+ allow(::VIM).to receive(:evaluate).with('a:arg').and_return('../directory-oops') - controller.show_file_finder -- mock(::VIM).command('silent CommandTOpen edit /working/directory-oops/path/to/selection') -+ expect(::VIM).to receive(:command).with('silent CommandTOpen edit /working/directory-oops/path/to/selection') - controller.accept_selection - end - - it 'does not enter an infinite loop when toggling focus' do - # https://github.com/wincent/command-t/issues/157 -- stub(::VIM).evaluate('a:arg').returns('') -+ allow(::VIM).to receive(:evaluate).with('a:arg').and_return('') - set_string('g:CommandTTraverseSCM', 'pwd') - controller.show_file_finder - expect { controller.toggle_focus }.to_not raise_error -@@ -59,43 +59,43 @@ describe CommandT::Controller do - - def stub_finder(sorted_matches=[]) - finder = CommandT::Finder::FileFinder.new -- stub(finder).path = anything -- stub(finder).sorted_matches_for(anything, anything).returns(sorted_matches) -- stub(CommandT::Finder::FileFinder).new.returns(finder) -+ allow(finder).to receive(:"path=").with(anything) -+ allow(finder).to receive(:sorted_matches_for).with(anything, anything).and_return(sorted_matches) -+ allow(CommandT::Finder::FileFinder).to receive(:new).and_return(finder) - end - - def stub_match_window(selection) - match_window = Object.new -- stub(match_window).matches = anything -- stub(match_window).leave -- stub(match_window).focus -- stub(match_window).selection.returns(selection) -- stub(CommandT::MatchWindow).new.returns(match_window) -+ allow(match_window).to receive(:"matches=").with(anything) -+ allow(match_window).to receive(:leave) -+ allow(match_window).to receive(:focus) -+ allow(match_window).to receive(:selection).and_return(selection) -+ allow(CommandT::MatchWindow).to receive(:new).and_return(match_window) - end - - def stub_prompt(abbrev='') - prompt = Object.new -- stub(prompt).focus -- stub(prompt).unfocus -- stub(prompt).clear! -- stub(prompt).redraw -- stub(prompt).abbrev.returns(abbrev) -- stub(CommandT::Prompt).new.returns(prompt) -+ allow(prompt).to receive(:focus) -+ allow(prompt).to receive(:unfocus) -+ allow(prompt).to receive(:clear!) -+ allow(prompt).to receive(:redraw) -+ allow(prompt).to receive(:abbrev).and_return(abbrev) -+ allow(CommandT::Prompt).to receive(:new).and_return(prompt) - end - - def stub_vim(working_directory) -- stub($curbuf).number.returns('0') -- stub(::VIM).command(/noremap/) -- stub(::VIM).command('silent b 0') -- stub(::VIM).command(/augroup/) -- stub(::VIM).command('au!') -- stub(::VIM).command(/autocmd/) -- stub(::VIM).evaluate(/exists\(.+\)/).returns('0') -- stub(::VIM).evaluate('getcwd()').returns(working_directory) -- stub(::VIM).evaluate('&buflisted').returns('1') -- stub(::VIM).evaluate('&lines').returns('80') -- stub(::VIM).evaluate('&term').returns('vt100') -- stub(::VIM).evaluate('v:version').returns(704) -- stub(::VIM).evaluate('!&buflisted && &buftype == "nofile"') -+ allow($curbuf).to receive(:number).and_return('0') -+ allow(::VIM).to receive(:command).with(/noremap/) -+ allow(::VIM).to receive(:command).with('silent b 0') -+ allow(::VIM).to receive(:command).with(/augroup/) -+ allow(::VIM).to receive(:command).with('au!') -+ allow(::VIM).to receive(:command).with(/autocmd/) -+ allow(::VIM).to receive(:evaluate).with(/exists\(.+\)/).and_return('0') -+ allow(::VIM).to receive(:evaluate).with('getcwd()').and_return(working_directory) -+ allow(::VIM).to receive(:evaluate).with('&buflisted').and_return('1') -+ allow(::VIM).to receive(:evaluate).with('&lines').and_return('80') -+ allow(::VIM).to receive(:evaluate).with('&term').and_return('vt100') -+ allow(::VIM).to receive(:evaluate).with('v:version').and_return(704) -+ allow(::VIM).to receive(:evaluate).with('!&buflisted && &buftype == "nofile"') - end - end -diff --git a/spec/command-t/finder/buffer_finder_spec.rb b/spec/command-t/finder/buffer_finder_spec.rb -index f0df4e1..be56463 100644 ---- a/spec/command-t/finder/buffer_finder_spec.rb -+++ b/spec/command-t/finder/buffer_finder_spec.rb -@@ -6,7 +6,7 @@ require 'spec_helper' - describe CommandT::Finder::BufferFinder do - before do - @paths = %w(.git/config .vim/notes .vimrc baz foo/beta) -- any_instance_of(CommandT::Scanner::BufferScanner, :paths => @paths) -+ allow_any_instance_of(CommandT::Scanner::BufferScanner).to receive(:paths).and_return(@paths) - @finder = CommandT::Finder::BufferFinder.new - end - -diff --git a/spec/command-t/finder/file_finder_spec.rb b/spec/command-t/finder/file_finder_spec.rb -index cac5388..9654105 100644 ---- a/spec/command-t/finder/file_finder_spec.rb -+++ b/spec/command-t/finder/file_finder_spec.rb -@@ -19,9 +19,9 @@ describe CommandT::Finder::FileFinder do - end - - before do -- stub(::VIM).evaluate(/expand/) { 0 } -- stub(::VIM).command(/echon/) -- stub(::VIM).command('redraw') -+ allow(::VIM).to receive(:evaluate).with(/expand/) { 0 } -+ allow(::VIM).to receive(:command).with(/echon/) -+ allow(::VIM).to receive(:command).with('redraw') - end - - describe 'sorted_matches_for method' do -diff --git a/spec/command-t/scanner/buffer_scanner_spec.rb b/spec/command-t/scanner/buffer_scanner_spec.rb -index acc3b7e..a4ade60 100644 ---- a/spec/command-t/scanner/buffer_scanner_spec.rb -+++ b/spec/command-t/scanner/buffer_scanner_spec.rb -@@ -14,10 +14,10 @@ describe CommandT::Scanner::BufferScanner do - before do - @paths = %w(bar/abc bar/xyz baz bing foo/alpha/t1 foo/alpha/t2 foo/beta) - @scanner = CommandT::Scanner::BufferScanner.new -- stub(@scanner).relative_path_under_working_directory(is_a(String)) { |arg| arg } -- stub(::VIM::Buffer).count { 7 } -+ allow(@scanner).to receive(:relative_path_under_working_directory).with(kind_of(String)) { |arg| arg } -+ allow(::VIM::Buffer).to receive(:count) { 7 } - (0..6).each do |n| -- stub(::VIM::Buffer)[n].returns(buffer @paths[n]) -+ allow(::VIM::Buffer).to receive(:'[]').with(n).and_return(buffer @paths[n]) - end - end - -diff --git a/spec/command-t/scanner/file_scanner/ruby_file_scanner_spec.rb b/spec/command-t/scanner/file_scanner/ruby_file_scanner_spec.rb -index 10f0e22..3d60c2e 100644 ---- a/spec/command-t/scanner/file_scanner/ruby_file_scanner_spec.rb -+++ b/spec/command-t/scanner/file_scanner/ruby_file_scanner_spec.rb -@@ -11,10 +11,10 @@ describe CommandT::Scanner::FileScanner::RubyFileScanner do - ) - @scanner = CommandT::Scanner::FileScanner::RubyFileScanner.new(@dir) - -- stub(::VIM).evaluate(/exists/) { 1 } -- stub(::VIM).evaluate(/expand\(.+\)/) { '0' } -- stub(::VIM).command(/echon/) -- stub(::VIM).command('redraw') -+ allow(::VIM).to receive(:evaluate).with(/exists/) { 1 } -+ allow(::VIM).to receive(:evaluate).with(/expand\(.+\)/) { '0' } -+ allow(::VIM).to receive(:command).with(/echon/) -+ allow(::VIM).to receive(:command).with('redraw') - end - - describe 'paths method' do -diff --git a/spec/command-t/scanner/file_scanner/watchman_file_scanner_spec.rb b/spec/command-t/scanner/file_scanner/watchman_file_scanner_spec.rb -index f6ec70d..ffad09e 100644 ---- a/spec/command-t/scanner/file_scanner/watchman_file_scanner_spec.rb -+++ b/spec/command-t/scanner/file_scanner/watchman_file_scanner_spec.rb -@@ -8,14 +8,12 @@ describe CommandT::Scanner::FileScanner::WatchmanFileScanner do - it 'falls back to the FindFileScanner' do - # fake an error - scanner = described_class.new -- stub(scanner).get_raw_sockname do -+ allow(scanner).to receive(:get_raw_sockname) do - raise described_class::WatchmanError - end - - # expect call on superclass -- any_instance_of(CommandT::Scanner::FileScanner::FindFileScanner) do |klass| -- mock(klass).paths! -- end -+ expect_any_instance_of(CommandT::Scanner::FileScanner::FindFileScanner).to receive(:paths!) - - scanner.paths! - end -diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb -index 2775956..370d46c 100644 ---- a/spec/spec_helper.rb -+++ b/spec/spec_helper.rb -@@ -16,10 +16,6 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) - require 'command-t' - require 'command-t/ext' - --RSpec.configure do |config| -- config.mock_framework = :rr --end -- - # Fake top-level VIM implementation, for stubbing. - module VIM - class << self --- -2.30.0 - diff --git a/vim-command-t-5.0.3-fix-tests.patch b/vim-command-t-5.0.3-fix-tests.patch deleted file mode 100644 index 229ed12..0000000 --- a/vim-command-t-5.0.3-fix-tests.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 52adb808e2db85035e9a5a214cb147280c2f10e0 Mon Sep 17 00:00:00 2001 -From: Greg Hurrell -Date: Thu, 4 Mar 2021 19:20:43 +0100 -Subject: [PATCH] test: fix tests - -These are all probably very sensitive to environment (Ruby version etc), -and I haven't run them for a while, so just doing a duct-tape and -chicken-wire kind of fix to get everything green on my system. - -Note that I "defanged" the BufferScanner tests which were failing and -were too complicated (too many mocks, so it is hard to be sure that they -verified anything at all) by effectively turning them into a -blinking-light demo that doesn't really do much. - -With these changes: - - Finished in 0.10298 seconds (files took 0.11239 seconds to load) - 121 examples, 0 failures, 1 pending ---- - spec/command-t/controller_spec.rb | 3 +++ - spec/command-t/scanner/buffer_scanner_spec.rb | 12 +----------- - 2 files changed, 4 insertions(+), 11 deletions(-) - -diff --git a/spec/command-t/controller_spec.rb b/spec/command-t/controller_spec.rb -index 6bbd6d78..70751c82 100644 ---- a/spec/command-t/controller_spec.rb -+++ b/spec/command-t/controller_spec.rb -@@ -95,6 +95,9 @@ def stub_vim(working_directory) - allow(::VIM).to receive(:evaluate).with('&buflisted').and_return('1') - allow(::VIM).to receive(:evaluate).with('&lines').and_return('80') - allow(::VIM).to receive(:evaluate).with('&term').and_return('vt100') -+ allow(::VIM).to receive(:evaluate).with("fnameescape('#{working_directory}-oops/path/to/selection')").and_return("#{working_directory}-oops/path/to/selection") -+ allow(::VIM).to receive(:evaluate).with("fnameescape('path/to/selection')").and_return('path/to/selection') -+ allow(::VIM).to receive(:evaluate).with("fnameescape('/working/outside/path/to/selection')").and_return('/working/outside/path/to/selection') - allow(::VIM).to receive(:evaluate).with('v:version').and_return(704) - allow(::VIM).to receive(:evaluate).with('!&buflisted && &buftype == "nofile"') - end -diff --git a/spec/command-t/scanner/buffer_scanner_spec.rb b/spec/command-t/scanner/buffer_scanner_spec.rb -index a4ade60c..d8a014a8 100644 ---- a/spec/command-t/scanner/buffer_scanner_spec.rb -+++ b/spec/command-t/scanner/buffer_scanner_spec.rb -@@ -5,20 +5,10 @@ - require 'ostruct' - - describe CommandT::Scanner::BufferScanner do -- def buffer(name) -- b = OpenStruct.new -- b.name = name -- b -- end -- - before do - @paths = %w(bar/abc bar/xyz baz bing foo/alpha/t1 foo/alpha/t2 foo/beta) - @scanner = CommandT::Scanner::BufferScanner.new -- allow(@scanner).to receive(:relative_path_under_working_directory).with(kind_of(String)) { |arg| arg } -- allow(::VIM::Buffer).to receive(:count) { 7 } -- (0..6).each do |n| -- allow(::VIM::Buffer).to receive(:'[]').with(n).and_return(buffer @paths[n]) -- end -+ allow(@scanner).to receive(:paths!).and_return(@paths) - end - - describe 'paths method' do diff --git a/vim-command-t-5.0.5-Use-SPDX-identifier-in-AppStream-metadata.patch b/vim-command-t-5.0.5-Use-SPDX-identifier-in-AppStream-metadata.patch new file mode 100644 index 0000000..fcbbf75 --- /dev/null +++ b/vim-command-t-5.0.5-Use-SPDX-identifier-in-AppStream-metadata.patch @@ -0,0 +1,22 @@ +From 654b440fdfd5eaf52fac6882035f3b53ab48a39f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADt=20Ondruch?= +Date: Mon, 14 Oct 2024 15:20:53 +0200 +Subject: [PATCH] Use SPDX identifier in AppStream metadata + +https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-metadata_license +--- + appstream/vim-command-t.metainfo.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/appstream/vim-command-t.metainfo.xml b/appstream/vim-command-t.metainfo.xml +index 53807879..78d08bdd 100644 +--- a/appstream/vim-command-t.metainfo.xml ++++ b/appstream/vim-command-t.metainfo.xml +@@ -7,6 +7,6 @@ + Provides an extremely fast, intuitive mechanism for opening files with a minimal number of keystrokes + https://github.com/wincent/command-t + CC0-1.0 +-BSD ++BSD-2-Clause + v.ondruch@gmail.com + diff --git a/vim-command-t.spec b/vim-command-t.spec index af21424..7cb7940 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -1,24 +1,18 @@ %global commandt_so_dir %{ruby_vendorarchdir}/command-t -%global appdata_dir %{_datadir}/appdata - Name: vim-command-t -Version: 5.0.3 -Release: 13%{?dist} +Version: 5.0.5 +Release: 1%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +License: BSD-2-Clause URL: https://github.com/wincent/command-t Source0: https://github.com/wincent/command-t/archive/%{version}/command-t-%{version}.tar.gz # Relax the Command-T version checking. # https://github.com/wincent/command-t/issues/192 Patch0: vim-3.0.2-Check-RUBY_LIB_VERSION-instead-of-RUBY_VERSION.patch -# Use rspec-mock for stubbing to fix the build failures with RR 1.2+. -# https://github.com/wincent/command-t/pull/375 -Patch1: vim-command-t-5.0.3-Use-rspec-mock-for-stubbing.patch -# Fix `CommandT::Scanner::BufferScanner` test. -# https://github.com/wincent/command-t/commit/52adb808e2db85035e9a5a214cb147280c2f10e0 -Patch2: vim-command-t-5.0.3-fix-tests.patch +# Use SPDX identifier in the AppStream data. +# https://github.com/wincent/command-t/pull/427 +Patch1: vim-command-t-5.0.5-Use-SPDX-identifier-in-AppStream-metadata.patch # https://github.com/wincent/command-t/commit/5147a93a4b6cdb60cfa0ed1b792de711f44cd7b4 # Ruby3.2 finally removes Fixnum Patch3: vim-command-t-5.0.3-ruby32-Fixnum-removal.patch @@ -38,6 +32,7 @@ BuildRequires: rubygem(rspec) >= 3 BuildRequires: gcc # Defines %%vimfiles_root BuildRequires: vim-filesystem +BuildRequires: %{_bindir}/appstream-util %description The Command-T plug-in for VIM provides an extremely fast, intuitive mechanism @@ -55,7 +50,6 @@ more weight. %patch 0 -p1 %patch 1 -p1 -%patch 2 -p1 %patch 3 -p1 %build @@ -80,8 +74,14 @@ mv %{buildroot}%{vimfiles_root}/ruby/command-t/ext/command-t/ext.so %{buildroot} find %{buildroot}%{vimfiles_root} -name '.*' -delete # Install AppData. -mkdir -p %{buildroot}%{appdata_dir} -install -m 644 appstream/vim-command-t.metainfo.xml %{buildroot}%{appdata_dir} +mkdir -p %{buildroot}%{_metainfodir} +install -m 644 appstream/vim-command-t.metainfo.xml %{buildroot}%{_metainfodir} + +# GVim ID in Fedora was changed by: +# https://src.fedoraproject.org/rpms/vim/pull-request/25 +# therefore extend also the new ID. +# TODO: Submit this upstream if it proves to work. +sed -i '/<\/extends>/a org.vim.Vim' %{buildroot}%{_metainfodir}/vim-command-t.metainfo.xml %check # Get rid of Bundler @@ -89,6 +89,8 @@ sed -i '/Bundler/,/^end$/ s/^/#/' spec/spec_helper.rb rspec -Iruby spec +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml + %files %license LICENSE %doc README.md @@ -96,18 +98,22 @@ rspec -Iruby spec %{vimfiles_root}/autoload/* %{vimfiles_root}/doc/* %{vimfiles_root}/plugin/* -%exclude %{vimfiles_root}/ruby/command-t/ext* -%exclude %{vimfiles_root}/ruby/command-t/*.o -%exclude %{vimfiles_root}/ruby/command-t/*.h -%exclude %{vimfiles_root}/ruby/command-t/*.c -%exclude %{vimfiles_root}/ruby/command-t/Makefile -%exclude %{vimfiles_root}/ruby/command-t/mkmf.log -%exclude %{vimfiles_root}/ruby/command-t/depend +%exclude %{vimfiles_root}/ruby/command-t/ext/command-t/ext* +%exclude %{vimfiles_root}/ruby/command-t/ext/command-t/*.o +%exclude %{vimfiles_root}/ruby/command-t/ext/command-t/*.h +%exclude %{vimfiles_root}/ruby/command-t/ext/command-t/*.c +%exclude %{vimfiles_root}/ruby/command-t/ext/command-t/Makefile +%exclude %{vimfiles_root}/ruby/command-t/ext/command-t/mkmf.log +%exclude %{vimfiles_root}/ruby/command-t/ext/command-t/depend %{vimfiles_root}/ruby -%{appdata_dir}/vim-command-t.metainfo.xml +%{_metainfodir}/vim-command-t.metainfo.xml %changelog +* Tue Oct 01 2024 Vít Ondruch - 5.0.5-1 +- Update to Command-T 5.0.5. + Resolves: rhbz#2091276 + * Wed Sep 04 2024 Miroslav Suchý - 5.0.3-13 - convert license to SPDX From a5894219cddfb6eae8e552182e1ed530b6ebaa7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 7 Jan 2025 20:06:33 +0100 Subject: [PATCH 41/47] Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.4 --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 7cb7940..b6840a4 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -2,7 +2,7 @@ Name: vim-command-t Version: 5.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD-2-Clause URL: https://github.com/wincent/command-t @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %changelog +* Tue Jan 07 2025 Vít Ondruch - 5.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.4 + * Tue Oct 01 2024 Vít Ondruch - 5.0.5-1 - Update to Command-T 5.0.5. Resolves: rhbz#2091276 From 2aef5849e9a4705b36031346ff1e052b93e6bc33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:21:02 +0000 Subject: [PATCH 42/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index b6840a4..d45b1e1 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -2,7 +2,7 @@ Name: vim-command-t Version: 5.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD-2-Clause URL: https://github.com/wincent/command-t @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 5.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Jan 07 2025 Vít Ondruch - 5.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.4 From ea2ad1a126fe3c3d260fd8fd3efebe0dfe3579dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:05:29 +0000 Subject: [PATCH 43/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index d45b1e1..4122b95 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -2,7 +2,7 @@ Name: vim-command-t Version: 5.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD-2-Clause URL: https://github.com/wincent/command-t @@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 5.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 5.0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 036e2dc251815dd4c9339677f0445da9da406aa5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 18 Nov 2025 09:26:45 +0900 Subject: [PATCH 44/47] Add BR: rubygem(ostruct) for ruby4_0 --- vim-command-t.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 4122b95..42b8dbb 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -2,7 +2,7 @@ Name: vim-command-t Version: 5.0.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD-2-Clause URL: https://github.com/wincent/command-t @@ -28,6 +28,7 @@ BuildRequires: make BuildRequires: ruby(release) BuildRequires: ruby-devel BuildRequires: rubygems +BuildRequires: rubygem(ostruct) BuildRequires: rubygem(rspec) >= 3 BuildRequires: gcc # Defines %%vimfiles_root @@ -110,6 +111,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %changelog +* Mon Nov 17 2025 Mamoru TASAKA - 5.0.5-5 +- Add BR: rubygem(ostruct) for ruby4_0 + * Fri Jul 25 2025 Fedora Release Engineering - 5.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 189247912441acf61af2fc3aa1dc61e4946000fc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Jan 2026 20:14:07 +0900 Subject: [PATCH 45/47] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 42b8dbb..3d43f42 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -2,7 +2,7 @@ Name: vim-command-t Version: 5.0.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD-2-Clause URL: https://github.com/wincent/command-t @@ -111,6 +111,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %changelog +* Thu Jan 08 2026 Mamoru TASAKA - 5.0.5-6 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 + * Mon Nov 17 2025 Mamoru TASAKA - 5.0.5-5 - Add BR: rubygem(ostruct) for ruby4_0 From bc237dfe3eea9fe572766c1e47072b16e667b90a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:54:42 +0000 Subject: [PATCH 46/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 3d43f42..d208aa3 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -2,7 +2,7 @@ Name: vim-command-t Version: 5.0.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD-2-Clause URL: https://github.com/wincent/command-t @@ -111,6 +111,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 5.0.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Thu Jan 08 2026 Mamoru TASAKA - 5.0.5-6 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 From 72705c75807ec4b9ef9e6e9404861b627a999bc0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:29:18 +0000 Subject: [PATCH 47/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- vim-command-t.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index d208aa3..591b30d 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -2,7 +2,7 @@ Name: vim-command-t Version: 5.0.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM License: BSD-2-Clause URL: https://github.com/wincent/command-t @@ -111,6 +111,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 5.0.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 5.0.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild