fish package update

Signed-off-by: tuibuilder_pel7x64builder0 <tuibuilder@powerel.org>
6 years ago · e0d5a2ec61
2 changed files with 418 additions and 0 deletions
--- a/SOURCES/0001-Don-t-use-less-in-highlighting-test.patch
+++ b/SOURCES/0001-Don-t-use-less-in-highlighting-test.patch
@ -0,0 +1,30 @@
 From 742fde0dd68858ad603b449501f0c42cd7864fab Mon Sep 17 00:00:00 2001
 From: Fabian Homborg <FHomborg@gmail.com>
 Date: Fri, 28 Dec 2018 17:57:53 +0100
 Subject: [PATCH] Don't use less in highlighting test
 It doesn't have to be installed.
 `cat` is in our dependencies, so we can assume it's there.
 Fixes #5436.
 ---
 src/fish_tests.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
 index f6094254..abe21a2e 100644
 --- a/src/fish_tests.cpp
 +++ b/src/fish_tests.cpp
@@ -4243,7 +4243,8 @@ static void test_highlighting() {
         {L"cat", highlight_spec_command},
         {L"/dev/null", highlight_spec_param},
         {L"|", highlight_spec_statement_terminator},
 -        {L"less", highlight_spec_command},
 +        // This is bogus, but we used to use "less" here and that doesn't have to be installed.
 +        {L"cat", highlight_spec_command},
         {L"2>", highlight_spec_redirection},
     });
 --
 2.20.1
--- a/SPECS/fish.spec
+++ b/SPECS/fish.spec
@ -0,0 +1,388 @@
 # This package depends on automagic byte compilation
 # https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
 %global _python_bytecompile_extra 1
 Name:           fish
 Version:        3.0.2
 Release:        1%{?dist}
 Summary:        Friendly interactive shell
 # GPLv2
 #   - src/fish.cpp
 #   and rest..
 # GPLv2+
 #   - src/builtin_printf.cpp
 # BSD
 #   - share/tools/create_manpage_completions.py
 # ISC
 #   - src/utf8.cpp
 #   - src/utf8.h
 # LGPLv2+
 #   - src/wgetopt.c
 #   - src/wgetopt.h
 # MIT
 #   - share/completions/grunt.fish
 #   - share/tools/web_config/js/angular-sanitize.js
 #   - share/tools/web_config/js/angular.js
 License:        GPLv2 and BSD and ISC and LGPLv2+ and MIT
 URL:            https://fishshell.com
 Source0:        https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.gz
 # https://github.com/fish-shell/fish-shell/commit/742fde0dd68858ad603b449501f0c42cd7864fab
 Patch0001:      0001-Don-t-use-less-in-highlighting-test.patch
 BuildRequires:  cmake3 >= 3.2
 BuildRequires:  ninja-build
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  doxygen
 BuildRequires:  ncurses-devel
 BuildRequires:  pcre2-devel
 BuildRequires:  python3-devel
 %global __python %{__python3}
 # tab completion wants man-db
 Requires:     man-db
 #Requires:     man-pages
 Requires:     groff-base
 %description
 fish is a fully-equipped command line shell (like bash or zsh) that is
 smart and user-friendly. fish supports powerful features like syntax
 highlighting, autosuggestions, and tab completions that just work, with
 nothing to learn or configure.
 %prep
 %autosetup -p1
 rm -vrf pcre2-*
 # Change the bundled scripts to invoke the python binary directly.
 for f in $(find share/tools -type f -name '*.py'); do
    sed -i -e '1{s@^#!.*@#!%{__python3}@}' "$f"
 done
 %build
 %cmake3 . -B%{_vpath_builddir} -GNinja -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}
 %ninja_build -C %{_vpath_builddir} all fish_tests
 %install
 %ninja_install -C %{_vpath_builddir}
 # Install docs from tarball root
 cp -a README.md %{buildroot}%{_pkgdocdir}
 cp -a CONTRIBUTING.md %{buildroot}%{_pkgdocdir}
 # filesystem will own a couple of config directories so that other packages
 # can ship fish config snippets without requiring fish:
 rmdir %{buildroot}%{_datadir}/fish/vendor_completions.d
 rmdir %{buildroot}%{_datadir}/fish/vendor_conf.d
 %find_lang %{name}
 %check
 %{_vpath_builddir}/fish_tests
 %post
 if [ "$1" = 1 ]; then
  if [ ! -f %{_sysconfdir}/shells ] ; then
    echo "%{_bindir}/fish" > %{_sysconfdir}/shells
    echo "/bin/fish" >> %{_sysconfdir}/shells
  else
    grep -q "^%{_bindir}/fish$" %{_sysconfdir}/shells || echo "%{_bindir}/fish" >> %{_sysconfdir}/shells
    grep -q "^/bin/fish$" %{_sysconfdir}/shells || echo "/bin/fish" >> %{_sysconfdir}/shells
  fi
 fi
 %postun
 if [ "$1" = 0 ] && [ -f %{_sysconfdir}/shells ] ; then
  sed -i '\!^%{_bindir}/fish$!d' %{_sysconfdir}/shells
  sed -i '\!^/bin/fish$!d' %{_sysconfdir}/shells
 fi
 %files -f %{name}.lang
 %license COPYING
 %{_mandir}/man1/fish*.1*
 %{_bindir}/fish*
 %config(noreplace) %{_sysconfdir}/fish/
 %{_datadir}/fish/
 %{_datadir}/pkgconfig/fish.pc
 %{_docdir}/%{name}/
 %{_docdir}/%{name}-%{version}
 %changelog
 * Sun Feb 24 2019 luto@kernel.org - 3.0.2-1
 - Update to 3.0.2
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 * Sat Jan 05 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.0.0-4
 - Fix crash in 'string match' subcommand
 * Sun Dec 30 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.0.0-3
 - Switch to CMake/Ninja
 * Sat Dec 29 2018 David Adam <zanchey@ucc.gu.uwa.edu.au> - 3.0.0-2
 - Move to CMake builds
 - Drop unneeded dependencies
 * Fri Dec 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.0.0-1
 - Update to 3.0.0
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.7.1-3
 - Rebuilt for Python 3.7
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 * Sun Jan 14 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.7.1-1
 - Update to 2.7.1
 * Wed Oct 04 2017 Andy Lutomirski <luto@kernel.org> - 2.6.0-1
 - Update to 2.6.0
 - Stop using bundled pcre2
 - Add some missing dependencies (rhbz #1478779)
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 * Sun Mar 12 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2.3.1-4
 - Drop ExcludeArch as ppc64le's tests now pass
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.1-2
 - Rebuild for Python 3.6
 * Thu Jul 07 2016 Oliver Haessler <oliver@redhat.com> - 2.3.1-1
 - Bump to 2.3.1
 * Sun Jun 26 2016 luto@kernel.org - 2.3.0-2
 - Require bc (rhbz 1349714)
 - Improve Fedora vs EPEL compatibility in the specfile
 * Sun May 22 2016 luto@kernel.org - 2.3.0-1
 - Bump to 2.3.0
 - Drop most Fedora patches
 * Fri Feb 26 2016 luto@kernel.org - 2.2.0-11
 - Add function/snippet hierarchy (backported from upstream)
 * Thu Feb 04 2016 luto@kernel.org - 2.2.0-10
 - Fix build on GCC 6
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 * Mon Jan 04 2016 Andy Lutomirski <luto@mit.edu> - 2.2.0-8
 - Tidy up EL compat
 * Sat Jan 02 2016 Oliver Haessler <oliver@redhat.com> - 2.2.0-7
 - included patch directly into the spec file
 - added new patch for using python3.4 on EPEL 7
 - excluded ppc64le as the fish_tests fail for this arch
 * Mon Dec 21 2015 Oliver Haessler <oliver@redhat.com> - 2.2.0-6
 - added new patch for EL7 build
 * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
 * Thu Sep 24 2015 Andy Lutomirski <luto@mit.edu> - 2.2.0-4
 - Hopefully fix rhbz #1263052 / upstream #2393
 * Thu Aug 20 2015 Andy Lutomirski <luto@mit.edu> - 2.2.0-3
 - Re-enable tests
 * Wed Aug 19 2015 Andy Lutomirski <luto@mit.edu> - 2.2.0-2
 - Fix docs on newer RPM
 * Wed Aug 19 2015 Andy Lutomirski <luto@mit.edu> - 2.0.0-1
 - Bump to 2.2.0
 - Drop most Fedora patches
 - Disable tests (broken upstream)
 - Adapt to new tarball contents
 - Drop Python 2 support (we will only target F22 and newer)
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.1.1-4
 - Rebuilt for GCC 5 C++11 ABI change
 * Wed Dec 17 2014 Andy Lutomirski <luto@mit.edu> - 2.1.1-3
 - For Fedora 22+, use Python 3
 * Sun Dec 14 2014 Andy Lutomirski <luto@mit.edu> - 2.1.1-2
 - Backport grep.fish fixes (rhbz #1173924)
 * Mon Sep 29 2014 Andy Lutomirski <luto@mit.edu> - 2.1.1-1
 - Update to 2.1.1
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 * Tue Aug 12 2014 Andy Lutomirski <luto@mit.edu> - 2.1.0-11
 - Improve fixes for CVE-2014-2905 and CVE-2014-2914
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 * Mon Apr 28 2014 Andy Lutomirski <luto@mit.edu> - 2.1.0-9
 - Fix CVE-2014-2914
 * Mon Apr 28 2014 Andy Lutomirski <luto@mit.edu> - 2.1.0-8
 - Fix build failure
 * Mon Apr 28 2014 Andy Lutomirski <luto@mit.edu> - 2.1.0-7
 - Fix CVE-2014-2905
 - Fix CVE-2014-2906
 * Fri Dec 20 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-6
 - Switch back to Python 2
 * Fri Dec 20 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-5
 - Add BR: python3 (for __pycache__)
 - Remove --without-xsel: fish dropped it in favor of a runtime check
 * Fri Dec 13 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-4
 - Stop looking in /usr/local (#1185 upstream)
 - Link with CXXFLAGS (#1062 upstream)
 - Use /usr/bin/python3 in scripts intead of /usr/bin/env
 - Add fish_tests to the build process
 - Split up the %%doc lines
 * Wed Dec 11 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-3
 - Use %%make_install instead of make install DESTDIR=...
 - Removed rm -rf %%{buildroot}
 - Added Requires: python
 * Tue Dec 10 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-2
 - Drop 'help' patch
 - Misc cleanups
 * Mon Dec 9 2013 Andy Lutomirski <luto@mit.edu> - 2.1.0-1
 - Update to 2.1.0 and update a lot of the specfile
 - Fix bogus changelog dates
 - Add a patch to make 'help' work on F19 (upstream #1065)
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Fri Jul 03 2009 Lorenzo Villani <lvillani@binaryhelix.net> - 1.23.1-3
 - Pass --without-xsel to configure, if you want xsel install its package instead
 - Fix file list
 - Drop unneeded BuildRequires
 * Fri Jul 03 2009 Lorenzo Villani <lvillani@binaryhelix.net> - 1.23.1-2
 - rebuilt
 * Fri Jul 03 2009 Lorenzo Villani <lvillani@binaryhelix.net> - 1.23.1-1
 - 1.23.1
 - Fix bz #472613
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 * Mon Sep 15 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.23.0-6
 - cleanups
 - define ARG_MAX properly so it compiles
 * Mon Jul 07 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.23.0-5
 - fix conditional comparison
 * Sun Jul 06 2008 Oliver Falk <oliver@linux-kernel.at> - 1.23.0-4
 - Rebuild
 * Wed May 21 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.23.0-3
 - fix license tag
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.23.0-2
 - Autorebuild for GCC 4.3
 * Mon Jan 14 2008 Oliver Falk <oliver@linux-kernel.at> - 1.23.0-1
 - Update to fix #208780
 - Remove openfix patch, included upstream now
 * Wed Oct 31 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-5
 - Fix glibc's open check, by providing mode, instead of working
  around...
 * Wed Oct 31 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-4
 - Update URL; Fixes bz#359451
 * Thu Aug 16 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-3
 - Workaround glibc's open check
 - Problem reported upstream; Should be fixed there
 * Tue Aug 07 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-2
 - Fix BR autoconf
 * Tue Aug 07 2007 Oliver Falk <oliver@linux-kernel.at> - 1.22.3-1
 - Update; Bug #236868
 - Add missing doxygen BR
 * Fri Aug 4 2006 Axel Liljencrantz<axel@liljencrantz.se> 1.21.10-4
 - Add better translation finding code from fedora spec to main spec. Thank you to Michael Schwendt.
 - Add missing dependency libXext-devel.
 - Remove one nesting level from dependency checking code.
 * Tue Aug 1 2006 Axel Liljencrantz<axel@liljencrantz.se> 1.21.10-1
 - Improved the dependency check for X headers. Thank you to Michael Schwendt for pointers on how to do this
 * Mon Jul 31 2006 Axel Liljencrantz<axel@liljencrantz.se> 1.21.10-1
 - Fixed spelling and punctuation as a per patch from Paul Howarth
 - Fixed dependencies as per patch from Paul Howarth
 * Tue Nov 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.17.0-0
 - 1.17.0
 * Sat Sep 24 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.14.0-0
 - 1.14.0
 * Mon Sep 12 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.4-0
 - 1.13.4
 * Wed Sep 07 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.3-0
 - 1.13.3
 * Tue Sep 06 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.2-0
 - 1.13.2
 * Tue Aug 30 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.1-0
 - 1.13.1
 * Sun Aug 28 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.0-0
 - 1.13.0
 * Sat Aug 13 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.13.0-0
 - Add completions subdirectory
 * Thu Jul 28 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.12.1-0
 - 1.12.1
 * Fri Jul 15 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.12.0-1
 - 1.12.0
 * Thu Jun 30 2005 Michael Schwendt <mschwendt@users.sf.net> 1.11.1-9
 - Set CFLAGS the proper way
 * Thu Jun 30 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.11.1-8
 - Fix revision number in changelog
 * Wed Jun 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.11.1-7
 - Send post-script output to /dev/null
 * Wed Jun 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.11.1-6
 - Add changelog section to spec file
 - Add macros to source tags
 - Add smp_mflags to 'make all'
 - Fix typo in post install scriptlet test
 - Set CFLAGS from spec file