diff --git a/.fish.metadata b/.fish.metadata index e78b137..b0e9602 100644 --- a/.fish.metadata +++ b/.fish.metadata @@ -1,2 +1 @@ -2a220f67b8eee0e0f2439411e9cc6c0320970caa SOURCES/fish-3.3.1.tar.xz -4174ec7d9a8e50f81cd464f0eab5a9520bac1532 SOURCES/fish-3.3.1.tar.xz.asc +bf67abc94308195bb15a307571bee9d294426345 SOURCES/fish-3.5.0.tar.xz diff --git a/.gitignore b/.gitignore index 4ed7cea..7e104dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/fish-3.3.1.tar.xz -SOURCES/fish-3.3.1.tar.xz.asc +SOURCES/fish-3.5.0.tar.xz diff --git a/SOURCES/fish-3.5.0.tar.xz.asc b/SOURCES/fish-3.5.0.tar.xz.asc new file mode 100644 index 0000000..53f886d --- /dev/null +++ b/SOURCES/fish-3.5.0.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEnh3gZzzMAykZ0YUmwLlpspdOiI4FAmKrEowACgkQwLlpspdO +iI4hCg//f3YSCeN/ZkL2CGRkbRVhW+GSasYSOHurwBThMrIo2Kzb25ToHqICYs8V +HDMyFE5D4p92veRCoGHEWlMWowxr074fHB+xe4kjPX8n+rjwQq+2EhA059QqOeDI +SEl7NCeRtCloKTjttfGOUwUJG0WmlFt3JEmrBu75xXJ0YvZ+3Y2jsSPljtIKmrM4 +LLDFCNNtwagSpRQZXAyExxiTz5BcUn54J2+Lmhnvckpn2lTWdjZaJTivRyQeS+SD +64VMDlZvYPw6NqNB67FA62Vn8ga53m6Ct6ZObH9ojXkA9mSXEd/f53F9VWui8N6M ++4itGqb65EkPyuQ9fk3LytLFJW2wLrXxYxTqRZfr2jsJMdrWni1xaX6QzKMPMmyV +XunMFgFWxz95xAzB1bX9pTgWSIWqUU9tQBiE8WCr2Ol5A38OblXWIPJA9Z3+kjrH +87U8CezStkJ6e2eBXFyGBuOsbftmD414yEb9Y3TXZy3+LMoGxgrVO2ejBowwAK+6 +piZkx2G+gQCvp62KJjdh/2aYUxresl8pc+m0BMN9+sAnL83tIH/6komfEmxFaEDD ++oL2+V+Gee27QlAiMtICF9dyaZxUH9Zlj/5nyLRUu2bYBMiOy0EONIUNI8i017nl +1xec32r1tWUAgikb8O7MkdcmILkIcvOyu0J2ESj4j8VaiZh88os= +=diiK +-----END PGP SIGNATURE----- diff --git a/SPECS/fish.spec b/SPECS/fish.spec index 34e3137..c85e626 100644 --- a/SPECS/fish.spec +++ b/SPECS/fish.spec @@ -1,34 +1,52 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.2.6) +%define autorelease(e:s:pb:) %{?-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*}}%{?dist} +## END: Set by rpmautospec + +%global version_base 3.5.0 +#global gitnum 120 +#global githash 1a0b1ae238e1deb132a0ae4a8d0c589d583cc5b0 +#global githashshort %{lua:print(string.sub(rpm.expand('%{githash}'), 1, 11))} + Name: fish -Version: 3.3.1 -Release: 3%{?dist}.1 +Version: %{version_base}%{?gitnum:^%{gitnum}g%{githashshort}} +Release: %autorelease Summary: Friendly interactive shell - # GPLv2 # - src/fish.cpp -# and rest.. +# and rest… # GPLv2+ # - 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.c +# - src/wgetopt.cpp # - 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 -# - 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.2 +BuildRequires: cmake >= 3.5 BuildRequires: ninja-build BuildRequires: gcc BuildRequires: gcc-c++ @@ -37,7 +55,11 @@ 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 @@ -45,9 +67,7 @@ Recommends: man-db Recommends: man-pages Recommends: groff-base -Provides: bundled(js-angular) = 1.0.8 -Provides: bundled(js-jquery) = 3.3.1 -Provides: bundled(js-underscore) = 1.9.1 +Provides: bundled(js-angular) = 1.8.2 %description fish is a fully-equipped command line shell (like bash or zsh) that is @@ -56,9 +76,14 @@ 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}' -%autosetup -p1 -rm -vrf pcre2-* +%endif +%autosetup -p1 %{?gitnum:-n fish-shell-%{githash}} +%if %{defined gitnum} +echo "%{version_base}-%{gitnum}g%{githashshort}" > version +%endif +rm -vr pcre2* # Change the bundled scripts to invoke the python binary directly. for f in $(find share/tools -type f -name '*.py'); do @@ -66,20 +91,21 @@ for f in $(find share/tools -type f -name '*.py'); do done %build -%cmake . -B%{_vpath_builddir} -GNinja \ +%cmake -GNinja \ + -DBUILD_DOCS=ON \ -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 -%ninja_build -C %{_vpath_builddir} all fish_tests +%cmake_build -t all doc 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 -%ninja_install -C %{_vpath_builddir} +%cmake_install # No more automagic Python bytecompilation phase 3 # * https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_3 @@ -92,7 +118,8 @@ cp -a CONTRIBUTING.rst %{buildroot}%{_pkgdocdir} %find_lang %{name} %check -%{_vpath_builddir}/fish_tests +# Sadly, ctest is broken +%ninja_build -C %{_vpath_builddir} test desktop-file-validate %{buildroot}%{_datadir}/applications/fish.desktop %post @@ -124,11 +151,35 @@ fi %{_datadir}/pixmaps/fish.png %changelog -* Wed Jan 10 2024 MSVSphere Packaging Team - 3.3.1-3 -- Rebuilt for MSVSphere 9.3 +* Tue May 14 2024 Arkady L. Shane - 3.5.0-1 +- Rebuilt for MSVSphere 9.4 -* Tue Dec 28 2021 Igor Raits - 3.3.1-3 -- Rebuild +* Fri Jun 17 2022 Siteshwar Vashisht 3.5.0-1 +- Update to 3.5.0 + +* Sun Apr 03 2022 Igor Raits 3.4.1^120g1a0b1ae238e-1 +- Update to 3.4.1-120-g1a0b1ae23 + +* Sun Apr 03 2022 Igor Raits 3.4.1-1 +- Update to 3.4.1 + +* Sun Mar 13 2022 Igor Raits 3.4.0-1 +- Update to 3.4.0 + +* Mon Feb 21 2022 Igor Raits 3.3.1^1075ge0bc944d5c5-1 +- Update to 3.3.1-1075-ge0bc944d5 + +* Sun Feb 06 2022 Igor Raits 3.3.1^1034g964b7a729a7-1 +- Update to 3.3.1-1034-g964b7a729 + +* Thu Jan 20 2022 Fedora Release Engineering 3.3.1^803g76a336d647e-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Dec 29 2021 Igor Raits 3.3.1^803g76a336d647e-2 +- Add missing BuildRequires for tests + +* Wed Dec 29 2021 Igor Raits 3.3.1^803g76a336d647e-1 +- Update to 3.3.1-803-g76a336d64 * Wed Jul 21 2021 Fedora Release Engineering - 3.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild @@ -456,3 +507,4 @@ fi - Add smp_mflags to 'make all' - Fix typo in post install scriptlet test - Set CFLAGS from spec file +