From 67468f2507dd49e2b3301b2dcc3fe6d1221c7a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 11 Aug 2014 14:45:58 +0200 Subject: [PATCH 1/6] Update to Command-T 1.10. --- .gitignore | 1 + sources | 2 +- vim-command-t.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 91b1ea8..108cc89 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /command-t-1.5.tar.gz /command-t-1.6.tar.gz /command-t-1.8.tar.gz +/command-t-1.10.tar.gz diff --git a/sources b/sources index f0962d1..0a15278 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ca34230eebbfae449c1399ba591591b command-t-1.8.tar.gz +f7ef747b3a8beae15b711079eb3aaa3c command-t-1.10.tar.gz diff --git a/vim-command-t.spec b/vim-command-t.spec index 870e512..8d77d3e 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -5,8 +5,8 @@ %global commandt_so_dir %{ruby_vendorarchdir}/command-t Name: vim-command-t -Version: 1.8 -Release: 2%{?dist} +Version: 1.10 +Release: 1%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -14,7 +14,7 @@ URL: https://wincent.com/products/command-t # Officialy distributed only using vimball: # https://wincent.com/issues/1978 # git clone git://git.wincent.com/command-t.git && cd command-t/ -# git archive 1.6 -o command-t-1.6.tar.gz +# git archive 1.10 -o command-t-1.10.tar.gz Source0: command-t-%{version}.tar.gz Requires: ruby(release) # Although command-t does not depend on rubygems directly, the RubyGems are @@ -72,7 +72,7 @@ cp -pa doc/command-t.txt README.txt %check # Get rid of Bundler -sed -i '24,+5d' spec/spec_helper.rb +sed -i '/Bundler/,/^end$/ s/^/#/' spec/spec_helper.rb rspec -Iruby spec @@ -100,6 +100,9 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %changelog +* Mon Aug 11 2014 Vít Ondruch - 1.10-1 +- Update to Command-T 1.10. + * Sun Jun 08 2014 Fedora Release Engineering - 1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From dddc59c36c2e4768fc8ea0a65990611604deb9cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 11 Aug 2014 15:55:31 +0200 Subject: [PATCH 2/6] Add Gnome Software plug-in AppData (rhbz#1110300). --- vim-command-t.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/vim-command-t.spec b/vim-command-t.spec index 8d77d3e..39e1d3d 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -4,6 +4,8 @@ %global commandt_so_dir %{ruby_vendorarchdir}/command-t +%global appdata_dir %{_datadir}/appdata + Name: vim-command-t Version: 1.10 Release: 1%{?dist} @@ -16,6 +18,9 @@ URL: https://wincent.com/products/command-t # git clone git://git.wincent.com/command-t.git && cd command-t/ # git archive 1.10 -o command-t-1.10.tar.gz Source0: command-t-%{version}.tar.gz +# Plug-in AppData for Gnome Software. +# https://github.com/wincent/Command-T/issues/99 +Source1: vim-command-t.metainfo.xml 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 @@ -70,6 +75,10 @@ find %{buildroot}%{vimfiles} -name '.*' -delete rm README.txt cp -pa doc/command-t.txt README.txt +# Install AppData. +mkdir -p %{buildroot}%{appdata_dir} +install -m 644 %{SOURCE1} %{buildroot}%{appdata_dir} + %check # Get rid of Bundler sed -i '/Bundler/,/^end$/ s/^/#/' spec/spec_helper.rb @@ -97,11 +106,13 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %exclude %{vimfiles}/ruby/command-t/mkmf.log %exclude %{vimfiles}/ruby/command-t/depend %{vimfiles}/ruby/* +%{appdata_dir}/vim-command-t.metainfo.xml %changelog * Mon Aug 11 2014 Vít Ondruch - 1.10-1 - Update to Command-T 1.10. +- Add Gnome Software plug-in AppData (rhbz#1110300). * Sun Jun 08 2014 Fedora Release Engineering - 1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From ade8ab3e54e374b595f7ae307c33b1a08a7d1831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 11 Aug 2014 16:03:41 +0200 Subject: [PATCH 3/6] Add AppData XML file. --- vim-command-t.metainfo.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 vim-command-t.metainfo.xml diff --git a/vim-command-t.metainfo.xml b/vim-command-t.metainfo.xml new file mode 100644 index 0000000..6bf1342 --- /dev/null +++ b/vim-command-t.metainfo.xml @@ -0,0 +1,12 @@ + + + +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 + From eb2ab2863e5582a2169bf3ab739d82e0b6e19be3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 11 Aug 2014 16:47:35 +0200 Subject: [PATCH 4/6] Add missing autoload directory. --- vim-command-t.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/vim-command-t.spec b/vim-command-t.spec index 39e1d3d..783a0d4 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -8,7 +8,7 @@ Name: vim-command-t Version: 1.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -62,7 +62,7 @@ popd %install mkdir -p %{buildroot}%{vimfiles} -cp -par {doc,plugin,ruby} %{buildroot}%{vimfiles} +cp -par {autoload,doc,plugin,ruby} %{buildroot}%{vimfiles} mkdir -p %{buildroot}%{commandt_so_dir} chmod 0755 %{buildroot}%{vimfiles}/ruby/command-t/ext.so @@ -96,6 +96,7 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %doc LICENSE %doc README.txt %{commandt_so_dir} +%{vimfiles}/autoload/* %{vimfiles}/doc/* %{vimfiles}/plugin/* %exclude %{vimfiles}/ruby/command-t/ext* @@ -105,11 +106,14 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %exclude %{vimfiles}/ruby/command-t/Makefile %exclude %{vimfiles}/ruby/command-t/mkmf.log %exclude %{vimfiles}/ruby/command-t/depend -%{vimfiles}/ruby/* +%{vimfiles}/ruby %{appdata_dir}/vim-command-t.metainfo.xml %changelog +* Mon Aug 11 2014 Vít Ondruch - 1.10-2 +- Add missing autoload directory. + * Mon Aug 11 2014 Vít Ondruch - 1.10-1 - Update to Command-T 1.10. - Add Gnome Software plug-in AppData (rhbz#1110300). From 34fc8a1e5b9f08377bddfcb2b152e759827b0e51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 15 Aug 2014 10:25:37 +0200 Subject: [PATCH 5/6] Fix BE arch issues. --- ...-failure-on-big-endian-architectures.patch | 75 +++++++++++++++++++ vim-command-t.spec | 10 ++- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 vim-command-t-1.10-Fix-test-failure-on-big-endian-architectures.patch diff --git a/vim-command-t-1.10-Fix-test-failure-on-big-endian-architectures.patch b/vim-command-t-1.10-Fix-test-failure-on-big-endian-architectures.patch new file mode 100644 index 0000000..e8ee8ff --- /dev/null +++ b/vim-command-t-1.10-Fix-test-failure-on-big-endian-architectures.patch @@ -0,0 +1,75 @@ +From 953aa33ab33ca6059f85dc8ebb40c3b6bbaae39c Mon Sep 17 00:00:00 2001 +From: Greg Hurrell +Date: Thu, 14 Aug 2014 07:40:39 -0700 +Subject: [PATCH] Fix (spurious) test failure on big-endian architectures + +Our example includes a int_64_t value (the PDU's length prefix), which +is endian-sensitive and so needs to be asserted using native endianness. + +Fixes: + + https://github.com/wincent/Command-T/issues/101 + https://bugzilla.redhat.com/show_bug.cgi?id=1130079 +--- + spec/command-t/watchman/utils_spec.rb | 45 ++++++++++++++++++++++++----------- + 1 file changed, 31 insertions(+), 14 deletions(-) + +diff --git a/spec/command-t/watchman/utils_spec.rb b/spec/command-t/watchman/utils_spec.rb +index 8f174f7..4bb5c4e 100644 +--- a/spec/command-t/watchman/utils_spec.rb ++++ b/spec/command-t/watchman/utils_spec.rb +@@ -379,20 +379,37 @@ def roundtrip(value) + + it 'generates a correct serialization' do + # in Ruby 1.8, hashes aren't ordered, so two serializations are possible +- expected = [ +- binary( +- "\x00\x01\x06\x49\x00\x00\x00\x00\x00\x00\x00\x00\x03\x03\x02\x03" \ +- "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x0aexpression" \ +- "\x00\x03\x02\x02\x03\x04type\x02\x03\x01f\x02\x03\x06fields\x00" \ +- "\x03\x01\x02\x03\x04name" +- ), +- binary( +- "\x00\x01\x06\x49\x00\x00\x00\x00\x00\x00\x00\x00\x03\x03\x02\x03" \ +- "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x06fields\x00" \ +- "\x03\x01\x02\x03\x04name\x02\x03\x0aexpression\x00\x03\x02\x02" \ +- "\x03\x04type\x02\x03\x01f" +- ) +- ] ++ if little_endian? ++ expected = [ ++ binary( ++ "\x00\x01\x06\x49\x00\x00\x00\x00\x00\x00\x00\x00\x03\x03\x02\x03" \ ++ "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x0a" \ ++ "expression\x00\x03\x02\x02\x03\x04type\x02\x03\x01f\x02\x03\x06" \ ++ "fields\x00\x03\x01\x02\x03\x04name" ++ ), ++ binary( ++ "\x00\x01\x06\x49\x00\x00\x00\x00\x00\x00\x00\x00\x03\x03\x02\x03" \ ++ "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x06fields" \ ++ "\x00\x03\x01\x02\x03\x04name\x02\x03\x0aexpression\x00\x03\x02" \ ++ "\x02\x03\x04type\x02\x03\x01f" ++ ) ++ ] ++ else ++ expected = [ ++ binary( ++ "\x00\x01\x06\x00\x00\x00\x00\x00\x00\x00\x49\x00\x03\x03\x02\x03" \ ++ "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x0a" \ ++ "expression\x00\x03\x02\x02\x03\x04type\x02\x03\x01f\x02\x03\x06" \ ++ "fields\x00\x03\x01\x02\x03\x04name" ++ ), ++ binary( ++ "\x00\x01\x06\x00\x00\x00\x00\x00\x00\x00\x49\x00\x03\x03\x02\x03" \ ++ "\x05query\x02\x03\x0a/some/path\x01\x03\x02\x02\x03\x06fields" \ ++ "\x00\x03\x01\x02\x03\x04name\x02\x03\x0aexpression\x00\x03\x02" \ ++ "\x02\x03\x04type\x02\x03\x01f" ++ ) ++ ] ++ end + expect(expected).to include(described_class.dump(query)) + end + end +-- +2.0.3 + diff --git a/vim-command-t.spec b/vim-command-t.spec index 783a0d4..f85fa3e 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -8,7 +8,7 @@ Name: vim-command-t Version: 1.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -21,6 +21,9 @@ 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 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 @@ -50,6 +53,8 @@ more weight. %prep %setup -q -c +%patch0 -p1 + %build pushd ./ruby/command-t @@ -111,6 +116,9 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %changelog +* Fri Aug 15 2014 Vít Ondruch - 1.10-3 +- Fix BE arch issues. + * Mon Aug 11 2014 Vít Ondruch - 1.10-2 - Add missing autoload directory. From b811ee6af9247fce2c44877e891c6d0e0b90f1e6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 07:54:24 +0000 Subject: [PATCH 6/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_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 f85fa3e..4c77015 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -8,7 +8,7 @@ Name: vim-command-t Version: 1.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM Group: Applications/Editors License: BSD @@ -116,6 +116,9 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Aug 15 2014 Vít Ondruch - 1.10-3 - Fix BE arch issues.