Compare commits

...
Sign in to create a new pull request.

6 commits

Author SHA1 Message Date
b811ee6af9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-18 07:54:24 +00:00
Vít Ondruch
34fc8a1e5b Fix BE arch issues. 2014-08-15 10:26:14 +02:00
Vít Ondruch
eb2ab2863e Add missing autoload directory. 2014-08-11 16:47:51 +02:00
Vít Ondruch
ade8ab3e54 Add AppData XML file. 2014-08-11 16:16:45 +02:00
Vít Ondruch
dddc59c36c Add Gnome Software plug-in AppData (rhbz#1110300). 2014-08-11 15:56:38 +02:00
Vít Ondruch
67468f2507 Update to Command-T 1.10. 2014-08-11 15:56:38 +02:00
5 changed files with 124 additions and 7 deletions

1
.gitignore vendored
View file

@ -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

View file

@ -1 +1 @@
5ca34230eebbfae449c1399ba591591b command-t-1.8.tar.gz
f7ef747b3a8beae15b711079eb3aaa3c command-t-1.10.tar.gz

View file

@ -0,0 +1,75 @@
From 953aa33ab33ca6059f85dc8ebb40c3b6bbaae39c Mon Sep 17 00:00:00 2001
From: Greg Hurrell <greg@hurrell.net>
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

View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014 Vít Ondruch <v.ondruch@gmail.com> -->
<component type="addon">
<id>vim-command-t</id>
<extends>gvim.desktop</extends>
<name>command-t</name>
<summary>Provides an extremely fast, intuitive mechanism for opening files with a minimal number of keystrokes</summary>
<url type="homepage">https://wincent.com/products/command-t</url>
<metadata_license>CC0-1.0</metadata_license>
<project_license>BSD</project_license>
<updatecontact>v.ondruch@gmail.com</updatecontact>
</component>

View file

@ -4,9 +4,11 @@
%global commandt_so_dir %{ruby_vendorarchdir}/command-t
%global appdata_dir %{_datadir}/appdata
Name: vim-command-t
Version: 1.8
Release: 2%{?dist}
Version: 1.10
Release: 4%{?dist}
Summary: An extremely fast, intuitive mechanism for opening files in VIM
Group: Applications/Editors
License: BSD
@ -14,8 +16,14 @@ 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
# 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
@ -45,6 +53,8 @@ more weight.
%prep
%setup -q -c
%patch0 -p1
%build
pushd ./ruby/command-t
@ -57,7 +67,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
@ -70,9 +80,13 @@ 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 '24,+5d' spec/spec_helper.rb
sed -i '/Bundler/,/^end$/ s/^/#/' spec/spec_helper.rb
rspec -Iruby spec
@ -87,6 +101,7 @@ vim -c ":helptags %{vimfiles}/doc" -c :q &> /dev/null
%doc LICENSE
%doc README.txt
%{commandt_so_dir}
%{vimfiles}/autoload/*
%{vimfiles}/doc/*
%{vimfiles}/plugin/*
%exclude %{vimfiles}/ruby/command-t/ext*
@ -96,10 +111,24 @@ 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 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Fri Aug 15 2014 Vít Ondruch <vondruch@redhat.com> - 1.10-3
- Fix BE arch issues.
* Mon Aug 11 2014 Vít Ondruch <vondruch@redhat.com> - 1.10-2
- Add missing autoload directory.
* Mon Aug 11 2014 Vít Ondruch <vondruch@redhat.com> - 1.10-1
- Update to Command-T 1.10.
- Add Gnome Software plug-in AppData (rhbz#1110300).
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild