From 6834948ce5536cc112783bdf4bdceabffc59554c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 30 Sep 2015 18:02:08 +0200 Subject: [PATCH] Update to Command-T 1.13. --- .gitignore | 1 + sources | 2 +- ...-failure-on-big-endian-architectures.patch | 75 ------------------- vim-command-t.metainfo.xml | 12 --- vim-command-t.spec | 18 ++--- 5 files changed, 9 insertions(+), 99 deletions(-) delete mode 100644 vim-command-t-1.10-Fix-test-failure-on-big-endian-architectures.patch delete mode 100644 vim-command-t.metainfo.xml diff --git a/.gitignore b/.gitignore index 108cc89..60a605d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /command-t-1.6.tar.gz /command-t-1.8.tar.gz /command-t-1.10.tar.gz +/command-t-1.13.tar.gz diff --git a/sources b/sources index 0a15278..dcdf1cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7ef747b3a8beae15b711079eb3aaa3c command-t-1.10.tar.gz +c13e71832be3b959907abdb2c750172a command-t-1.13.tar.gz diff --git a/vim-command-t-1.10-Fix-test-failure-on-big-endian-architectures.patch b/vim-command-t-1.10-Fix-test-failure-on-big-endian-architectures.patch deleted file mode 100644 index e8ee8ff..0000000 --- a/vim-command-t-1.10-Fix-test-failure-on-big-endian-architectures.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 953aa33ab33ca6059f85dc8ebb40c3b6bbaae39c Mon Sep 17 00:00:00 2001 -From: Greg Hurrell -Date: Thu, 14 Aug 2014 07:40:39 -0700 -Subject: [PATCH] Fix (spurious) test failure on big-endian architectures - -Our example includes a int_64_t value (the PDU's length prefix), which -is endian-sensitive and so needs to be asserted using native endianness. - -Fixes: - - https://github.com/wincent/Command-T/issues/101 - https://bugzilla.redhat.com/show_bug.cgi?id=1130079 ---- - spec/command-t/watchman/utils_spec.rb | 45 ++++++++++++++++++++++++----------- - 1 file changed, 31 insertions(+), 14 deletions(-) - -diff --git a/spec/command-t/watchman/utils_spec.rb b/spec/command-t/watchman/utils_spec.rb -index 8f174f7..4bb5c4e 100644 ---- a/spec/command-t/watchman/utils_spec.rb -+++ b/spec/command-t/watchman/utils_spec.rb -@@ -379,20 +379,37 @@ def roundtrip(value) - - it 'generates a correct serialization' do - # in Ruby 1.8, hashes aren't ordered, so two serializations are possible -- expected = [ -- binary( -- "\x00\x01\x06\x49\x00\x00\x00\x00\x00\x00\x00\x00\x03\x03\x02\x03" \ -- "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x0aexpression" \ -- "\x00\x03\x02\x02\x03\x04type\x02\x03\x01f\x02\x03\x06fields\x00" \ -- "\x03\x01\x02\x03\x04name" -- ), -- binary( -- "\x00\x01\x06\x49\x00\x00\x00\x00\x00\x00\x00\x00\x03\x03\x02\x03" \ -- "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x06fields\x00" \ -- "\x03\x01\x02\x03\x04name\x02\x03\x0aexpression\x00\x03\x02\x02" \ -- "\x03\x04type\x02\x03\x01f" -- ) -- ] -+ if little_endian? -+ expected = [ -+ binary( -+ "\x00\x01\x06\x49\x00\x00\x00\x00\x00\x00\x00\x00\x03\x03\x02\x03" \ -+ "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x0a" \ -+ "expression\x00\x03\x02\x02\x03\x04type\x02\x03\x01f\x02\x03\x06" \ -+ "fields\x00\x03\x01\x02\x03\x04name" -+ ), -+ binary( -+ "\x00\x01\x06\x49\x00\x00\x00\x00\x00\x00\x00\x00\x03\x03\x02\x03" \ -+ "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x06fields" \ -+ "\x00\x03\x01\x02\x03\x04name\x02\x03\x0aexpression\x00\x03\x02" \ -+ "\x02\x03\x04type\x02\x03\x01f" -+ ) -+ ] -+ else -+ expected = [ -+ binary( -+ "\x00\x01\x06\x00\x00\x00\x00\x00\x00\x00\x49\x00\x03\x03\x02\x03" \ -+ "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x0a" \ -+ "expression\x00\x03\x02\x02\x03\x04type\x02\x03\x01f\x02\x03\x06" \ -+ "fields\x00\x03\x01\x02\x03\x04name" -+ ), -+ binary( -+ "\x00\x01\x06\x00\x00\x00\x00\x00\x00\x00\x49\x00\x03\x03\x02\x03" \ -+ "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x06fields" \ -+ "\x00\x03\x01\x02\x03\x04name\x02\x03\x0aexpression\x00\x03\x02" \ -+ "\x02\x03\x04type\x02\x03\x01f" -+ ) -+ ] -+ end - expect(expected).to include(described_class.dump(query)) - end - end --- -2.0.3 - diff --git a/vim-command-t.metainfo.xml b/vim-command-t.metainfo.xml deleted file mode 100644 index 6bf1342..0000000 --- a/vim-command-t.metainfo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - -vim-command-t -gvim.desktop -command-t -Provides an extremely fast, intuitive mechanism for opening files with a minimal number of keystrokes -https://wincent.com/products/command-t -CC0-1.0 -BSD -v.ondruch@gmail.com - diff --git a/vim-command-t.spec b/vim-command-t.spec index f035d3f..ed21c56 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -7,8 +7,8 @@ %global appdata_dir %{_datadir}/appdata Name: vim-command-t -Version: 1.10 -Release: 7%{?dist} +Version: 1.13 +Release: 1%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -16,14 +16,8 @@ URL: https://wincent.com/products/command-t # Officialy distributed only using vimball: # https://wincent.com/issues/1978 # git clone git://git.wincent.com/command-t.git && cd command-t/ -# git archive 1.10 -o command-t-1.10.tar.gz +# git archive 1.13 -o command-t-1.13.tar.gz Source0: command-t-%{version}.tar.gz -# Plug-in AppData for Gnome Software. -# https://github.com/wincent/Command-T/issues/99 -Source1: vim-command-t.metainfo.xml -# Fix test failure on BE architectures (rhbz#1130079). -# https://github.com/wincent/Command-T/commit/953aa33ab33ca6059f85dc8ebb40c3b6bbaae39c -Patch0: vim-command-t-1.10-Fix-test-failure-on-big-endian-architectures.patch # Support rspec3 style Patch1: vim-command-t-1.10-support-Rspec-3-style.patch Requires: ruby(release) @@ -55,7 +49,6 @@ more weight. %prep %setup -q -c -%patch0 -p1 %patch1 -p1 %build @@ -85,7 +78,7 @@ cp -pa doc/command-t.txt README.txt # Install AppData. mkdir -p %{buildroot}%{appdata_dir} -install -m 644 %{SOURCE1} %{buildroot}%{appdata_dir} +install -m 644 appstream/vim-command-t.metainfo.xml %{buildroot}%{appdata_dir} %check # Get rid of Bundler @@ -119,6 +112,9 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %changelog +* Wed Sep 30 2015 Vít Ondruch - 1.13-1 +- Update to Command-T 1.13. + * Fri Jun 19 2015 Fedora Release Engineering - 1.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild