|
|
|
|
@ -1,56 +1,34 @@
|
|
|
|
|
## START: Set by rpmautospec
|
|
|
|
|
## (rpmautospec version 0.7.3)
|
|
|
|
|
## RPMAUTOSPEC: autorelease, autochangelog
|
|
|
|
|
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
|
|
|
|
|
release_number = 1;
|
|
|
|
|
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
|
|
|
|
|
print(release_number + base_release_number - 1);
|
|
|
|
|
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
|
|
|
|
|
## END: Set by rpmautospec
|
|
|
|
|
|
|
|
|
|
%global version_base 3.7.1
|
|
|
|
|
%dnl %global gitnum 120
|
|
|
|
|
%dnl %global githash 1a0b1ae238e1deb132a0ae4a8d0c589d583cc5b0
|
|
|
|
|
%dnl %global githashshort %{lua:print(string.sub(rpm.expand('%{githash}'), 1, 11))}
|
|
|
|
|
|
|
|
|
|
Name: fish
|
|
|
|
|
Version: %{version_base}%{?gitnum:^%{gitnum}g%{githashshort}}
|
|
|
|
|
Release: %autorelease
|
|
|
|
|
Version: 3.3.1
|
|
|
|
|
Release: 3%{?dist}
|
|
|
|
|
Summary: Friendly interactive shell
|
|
|
|
|
# see also doc_src/license.rst
|
|
|
|
|
|
|
|
|
|
# GPLv2
|
|
|
|
|
# - src/fish.cpp
|
|
|
|
|
# and rest…
|
|
|
|
|
# and rest..
|
|
|
|
|
# GPLv2+
|
|
|
|
|
# - src/builtins/printf.cpp
|
|
|
|
|
# - src/builtin_printf.cpp
|
|
|
|
|
# BSD
|
|
|
|
|
# - src/fallback.cpp
|
|
|
|
|
# - share/tools/create_manpage_completions.py
|
|
|
|
|
# ISC
|
|
|
|
|
# - src/env.cpp
|
|
|
|
|
# - src/utf8.cpp
|
|
|
|
|
# - src/utf8.h
|
|
|
|
|
# LGPLv2+
|
|
|
|
|
# - src/wgetopt.cpp
|
|
|
|
|
# - src/wgetopt.c
|
|
|
|
|
# - src/wgetopt.h
|
|
|
|
|
# MIT
|
|
|
|
|
# - share/completions/grunt.fish
|
|
|
|
|
# - share/tools/web_config/js/angular-route.js
|
|
|
|
|
# - share/tools/web_config/js/angular-sanitize.js
|
|
|
|
|
# - share/tools/web_config/js/angular.js
|
|
|
|
|
# PSF-2.0
|
|
|
|
|
# - doc_src/python_docs_theme/,
|
|
|
|
|
License: GPL-2.0-only AND BSD-3-Clause AND ISC AND LGPL-2.0-or-later AND MIT AND PSF-2.0
|
|
|
|
|
# - user_doc/html/_static/jquery.js
|
|
|
|
|
# - user_doc/html/_static/underscore.js
|
|
|
|
|
License: GPLv2 and BSD and ISC and LGPLv2+ and MIT
|
|
|
|
|
URL: https://fishshell.com
|
|
|
|
|
%if %{undefined gitnum}
|
|
|
|
|
Source0: https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.xz
|
|
|
|
|
Source1: https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.xz.asc
|
|
|
|
|
Source2: gpgkey-003837986104878835FA516D7A67D962D88A709A.gpg
|
|
|
|
|
%else
|
|
|
|
|
Source0: https://github.com/fish-shell/fish-shell/archive/%{githash}/%{name}-%{githash}.tar.gz
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
BuildRequires: cmake >= 3.5
|
|
|
|
|
BuildRequires: cmake >= 3.2
|
|
|
|
|
BuildRequires: ninja-build
|
|
|
|
|
BuildRequires: gcc
|
|
|
|
|
BuildRequires: gcc-c++
|
|
|
|
|
@ -59,11 +37,7 @@ BuildRequires: ncurses-devel
|
|
|
|
|
BuildRequires: pcre2-devel
|
|
|
|
|
BuildRequires: gnupg2
|
|
|
|
|
BuildRequires: python3-devel
|
|
|
|
|
BuildRequires: python3-pexpect
|
|
|
|
|
BuildRequires: procps-ng
|
|
|
|
|
BuildRequires: glibc-langpack-en
|
|
|
|
|
%global __python %{__python3}
|
|
|
|
|
BuildRequires: /usr/bin/sphinx-build
|
|
|
|
|
BuildRequires: /usr/bin/desktop-file-validate
|
|
|
|
|
|
|
|
|
|
# tab completion wants man-db
|
|
|
|
|
@ -71,7 +45,9 @@ Recommends: man-db
|
|
|
|
|
Recommends: man-pages
|
|
|
|
|
Recommends: groff-base
|
|
|
|
|
|
|
|
|
|
Provides: bundled(js-angular) = 1.8.2
|
|
|
|
|
Provides: bundled(js-angular) = 1.0.8
|
|
|
|
|
Provides: bundled(js-jquery) = 3.3.1
|
|
|
|
|
Provides: bundled(js-underscore) = 1.9.1
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
fish is a fully-equipped command line shell (like bash or zsh) that is
|
|
|
|
|
@ -80,13 +56,9 @@ highlighting, autosuggestions, and tab completions that just work, with
|
|
|
|
|
nothing to learn or configure.
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%if %{undefined gitnum}
|
|
|
|
|
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
|
|
|
|
%endif
|
|
|
|
|
%autosetup -p1 %{?gitnum:-n fish-shell-%{githash}}
|
|
|
|
|
%if %{defined gitnum}
|
|
|
|
|
echo "%{version_base}-%{gitnum}g%{githashshort}" > version
|
|
|
|
|
%endif
|
|
|
|
|
%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
|
|
|
|
|
@ -94,21 +66,20 @@ for f in $(find share/tools -type f -name '*.py'); do
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%cmake -GNinja \
|
|
|
|
|
-DBUILD_DOCS=ON \
|
|
|
|
|
%cmake . -B%{_vpath_builddir} -GNinja \
|
|
|
|
|
-DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \
|
|
|
|
|
-Dextra_completionsdir=%{_datadir}/%{name}/vendor_completions.d \
|
|
|
|
|
-Dextra_functionsdir=%{_datadir}/%{name}/vendor_functions.d \
|
|
|
|
|
-Dextra_confdir=%{_datadir}/%{name}/vendor_conf.d
|
|
|
|
|
|
|
|
|
|
%cmake_build -t all doc fish_tests
|
|
|
|
|
%ninja_build -C %{_vpath_builddir} all fish_tests
|
|
|
|
|
|
|
|
|
|
# We still need to slightly manually adapt the pkgconfig file and remove
|
|
|
|
|
# some /usr/local/ references (RHBZ#1869376)
|
|
|
|
|
sed -i 's^/usr/local/^/usr/^g' %{_vpath_builddir}/*.pc
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
|
%cmake_install
|
|
|
|
|
%ninja_install -C %{_vpath_builddir}
|
|
|
|
|
|
|
|
|
|
# No more automagic Python bytecompilation phase 3
|
|
|
|
|
# * https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_3
|
|
|
|
|
@ -121,8 +92,7 @@ cp -a CONTRIBUTING.rst %{buildroot}%{_pkgdocdir}
|
|
|
|
|
%find_lang %{name}
|
|
|
|
|
|
|
|
|
|
%check
|
|
|
|
|
# Sadly, ctest is broken
|
|
|
|
|
%ninja_build -C %{_vpath_builddir} test
|
|
|
|
|
%{_vpath_builddir}/fish_tests
|
|
|
|
|
desktop-file-validate %{buildroot}%{_datadir}/applications/fish.desktop
|
|
|
|
|
|
|
|
|
|
%post
|
|
|
|
|
@ -154,78 +124,8 @@ fi
|
|
|
|
|
%{_datadir}/pixmaps/fish.png
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Tue Dec 17 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 3.7.1-1
|
|
|
|
|
- Rebuilt for MSVSphere 10
|
|
|
|
|
|
|
|
|
|
## START: Generated by rpmautospec
|
|
|
|
|
* Sat Jul 27 2024 ErrorNoInternet <errornointernet@envs.net> - 3.7.1-1
|
|
|
|
|
- New upstream release 3.7.1 (fixes rhbz#2270247)
|
|
|
|
|
|
|
|
|
|
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-4
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-3
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Jan 02 2024 Neal Gompa <ngompa@fedoraproject.org> - 3.7.0-1
|
|
|
|
|
- New upstream release 3.7.0 (Resolves: rhbz#2256375)
|
|
|
|
|
|
|
|
|
|
* Mon Dec 11 2023 Dan Čermák <dan.cermak@cgc-instruments.com> - 3.6.4-2
|
|
|
|
|
- Remove duplicate AND from License tag
|
|
|
|
|
|
|
|
|
|
* Wed Dec 06 2023 Dan Čermák <dan.cermak@cgc-instruments.com> - 3.6.4-1
|
|
|
|
|
- New upstream release 3.6.4, fixes rhbz#2252773
|
|
|
|
|
|
|
|
|
|
* Wed Dec 06 2023 Dan Čermák <dan.cermak@cgc-instruments.com> - 3.6.1-4
|
|
|
|
|
- Switch license identifier to SPDX and add missing PSF-2.0
|
|
|
|
|
|
|
|
|
|
* Tue Dec 05 2023 Dan Čermák <dan.cermak@cgc-instruments.com> - 3.6.1-3
|
|
|
|
|
- Use proper rpm comments to prevent macro expansion
|
|
|
|
|
|
|
|
|
|
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Mon Apr 10 2023 Siteshwar Vashisht <svashisht@redhat.com> - 3.6.1-1
|
|
|
|
|
- Update to 3.6.1
|
|
|
|
|
|
|
|
|
|
* Tue Jan 31 2023 Siteshwar Vashisht <svashisht@redhat.com> - 3.6.0-1
|
|
|
|
|
- Update to 3.6.0
|
|
|
|
|
|
|
|
|
|
* Mon Aug 15 2022 Siteshwar Vashisht <svashisht@redhat.com> - 3.5.1-1
|
|
|
|
|
- Update to 3.5.1
|
|
|
|
|
|
|
|
|
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Fri Jun 17 2022 Siteshwar Vashisht <svashisht@redhat.com> - 3.5.0-1
|
|
|
|
|
- Update to 3.5.0
|
|
|
|
|
|
|
|
|
|
* Sun Apr 03 2022 Igor Raits <igor.raits@gmail.com> - 3.4.1^120g1a0b1ae238e-1
|
|
|
|
|
- Update to 3.4.1-120-g1a0b1ae23
|
|
|
|
|
|
|
|
|
|
* Sun Apr 03 2022 Igor Raits <igor.raits@gmail.com> - 3.4.1-1
|
|
|
|
|
- Update to 3.4.1
|
|
|
|
|
|
|
|
|
|
* Sun Mar 13 2022 Igor Raits <igor.raits@gmail.com> - 3.4.0-1
|
|
|
|
|
- Update to 3.4.0
|
|
|
|
|
|
|
|
|
|
* Mon Feb 21 2022 Igor Raits <igor.raits@gmail.com> - 3.3.1^1075ge0bc944d5c5-1
|
|
|
|
|
- Update to 3.3.1-1075-ge0bc944d5
|
|
|
|
|
|
|
|
|
|
* Sun Feb 06 2022 Igor Raits <igor.raits@gmail.com> - 3.3.1^1034g964b7a729a7-1
|
|
|
|
|
- Update to 3.3.1-1034-g964b7a729
|
|
|
|
|
|
|
|
|
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1^803g76a336d647e-3
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Wed Dec 29 2021 Igor Raits <igor.raits@gmail.com> - 3.3.1^803g76a336d647e-2
|
|
|
|
|
- Add missing BuildRequires for tests
|
|
|
|
|
|
|
|
|
|
* Wed Dec 29 2021 Igor Raits <igor.raits@gmail.com> - 3.3.1^803g76a336d647e-1
|
|
|
|
|
- Update to 3.3.1-803-g76a336d64
|
|
|
|
|
* Tue Dec 28 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.3.1-3
|
|
|
|
|
- Rebuild
|
|
|
|
|
|
|
|
|
|
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
|
|
|
@ -553,5 +453,3 @@ fi
|
|
|
|
|
- Add smp_mflags to 'make all'
|
|
|
|
|
- Fix typo in post install scriptlet test
|
|
|
|
|
- Set CFLAGS from spec file
|
|
|
|
|
|
|
|
|
|
## END: Generated by rpmautospec
|
