diff --git a/.gitignore b/.gitignore index dc3e676..1b2b182 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /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 +/command-t-5.0.5.tar.gz diff --git a/sources b/sources index f0b8adb..93b910a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (command-t-5.0.2.tar.gz) = f8c8356231c3fb0f3a91cb61f534acac4dd401721a940c6ea045ada287d29395923eb46b1cb4f55b8254000f10eea9970841531abb2b110992180a1edbd66b81 +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-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-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 e3168b7..591b30d 100644 --- a/vim-command-t.spec +++ b/vim-command-t.spec @@ -1,17 +1,21 @@ %global commandt_so_dir %{ruby_vendorarchdir}/command-t -%global appdata_dir %{_datadir}/appdata - Name: vim-command-t -Version: 5.0.2 -Release: 7%{?dist} +Version: 5.0.5 +Release: 8%{?dist} Summary: An extremely fast, intuitive mechanism for opening files in VIM -License: 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 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 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 @@ -20,14 +24,16 @@ Requires: ruby(release) # support some conditional requires. Requires: ruby(rubygems) Requires: vim-common +BuildRequires: make BuildRequires: ruby(release) BuildRequires: ruby-devel BuildRequires: rubygems +BuildRequires: rubygem(ostruct) BuildRequires: rubygem(rspec) >= 3 -BuildRequires: rubygem(rr) 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 @@ -43,7 +49,9 @@ more weight. %prep %setup -q -n command-t-%{version} -%patch0 -p1 +%patch 0 -p1 +%patch 1 -p1 +%patch 3 -p1 %build pushd ./ruby/command-t/ext/command-t @@ -67,8 +75,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 @@ -76,6 +90,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 @@ -83,18 +99,101 @@ 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 +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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