From 1e3d0b1edc7392c3290a5249b835467afdf7f7c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Jan 26 2021 05:34:33 +0000 Subject: [PATCH 1/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diff --git a/fish.spec b/fish.spec index 867b31e..3e83b87 100644 --- a/fish.spec +++ b/fish.spec @@ -1,6 +1,6 @@ Name: fish Version: 3.1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Friendly interactive shell # GPLv2 @@ -120,6 +120,9 @@ fi %{_pkgdocdir} %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Aug 25 2020 Oliver Falk - 3.1.2-5 - Correct pkgconfig references to /usr/local (RHBZ#1869376) From 1d41bd00c2886611e6a1c0a82ba21b13576e491c Mon Sep 17 00:00:00 2001 From: Siteshwar Vashisht Date: Mar 13 2021 18:23:44 +0000 Subject: [PATCH 2/9] Update to 3.2.0 Resolves: #1933886 --- diff --git a/.gitignore b/.gitignore index a10b08a..f795c0a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ /fish-3.1.0.tar.gz.asc /fish-3.1.2.tar.gz /fish-3.1.2.tar.gz.asc +/fish-3.2.0.tar.xz +/fish-3.2.0.tar.xz.asc diff --git a/0001-fd_monitor-Explicity-include-thread.patch b/0001-fd_monitor-Explicity-include-thread.patch new file mode 100644 index 0000000..43d8100 --- /dev/null +++ b/0001-fd_monitor-Explicity-include-thread.patch @@ -0,0 +1,27 @@ +From 955c0003ca923dea76e9c953cda871d4209f028b Mon Sep 17 00:00:00 2001 +From: Fabian Homborg +Date: Tue, 2 Mar 2021 15:27:13 +0100 +Subject: [PATCH] fd_monitor: Explicity include + +Might fix issues with gcc 11.0.1. + +See #7764. +--- + src/fd_monitor.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/fd_monitor.cpp b/src/fd_monitor.cpp +index a55e9c55f..2ed2ca4de 100644 +--- a/src/fd_monitor.cpp ++++ b/src/fd_monitor.cpp +@@ -4,6 +4,7 @@ + #include "fd_monitor.h" + + #include ++#include //this_thread::sleep_for + + #include "flog.h" + #include "io.h" +-- +2.29.2 + diff --git a/0001-tests-Don-t-break-when-a-file-unexpectedly-exists.patch b/0001-tests-Don-t-break-when-a-file-unexpectedly-exists.patch new file mode 100644 index 0000000..8d8591f --- /dev/null +++ b/0001-tests-Don-t-break-when-a-file-unexpectedly-exists.patch @@ -0,0 +1,49 @@ +From 29ebd4a5ff5c0a0eefe802a4bcaa8ef32cc5795a Mon Sep 17 00:00:00 2001 +From: Fabian Homborg +Date: Sat, 13 Mar 2021 17:22:35 +0100 +Subject: [PATCH] tests: Don't break when a file unexpectedly exists + +Creating a file called "xfoo" could break the highlight tests because +we'd suddenly get a color with valid_path set to true. + +So what we do is simply compare foreground/background and forced +underline, but only check for path validity if we're expecting a valid +path. + +If we're not expecting a valid path, we don't fail whether it is there +or not. + +This means that we can't check for a non-valid path, but we don't +currently do that anyway and we can just burn that bridge when we get +to it. + +cc @siteshwar @krobelus, who both came across this +--- + src/fish_tests.cpp | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp +index 5f57f9e64..3f7777138 100644 +--- a/src/fish_tests.cpp ++++ b/src/fish_tests.cpp +@@ -5386,7 +5386,16 @@ static void test_highlighting() { + // Hackish space handling. We don't care about the colors in spaces. + if (text.at(i) == L' ') continue; + +- if (expected_colors.at(i) != colors.at(i)) { ++ auto e = expected_colors.at(i); ++ auto c = colors.at(i); ++ // Compare the colors, but don't care about pathness ++ // unless we're asking for a valid path. ++ // ++ // That way stray files in the build directory don't break the test. ++ if (e.foreground != c.foreground ++ || e.background != c.background ++ || e.force_underline != c.force_underline ++ || (e.valid_path && !c.valid_path)) { + const wcstring spaces(i, L' '); + err(L"Wrong color in test at index %lu in text (expected %#x, actual " + L"%#x):\n%ls\n%ls^", +-- +2.29.2 + diff --git a/fish.spec b/fish.spec index 3e83b87..5f2860c 100644 --- a/fish.spec +++ b/fish.spec @@ -1,6 +1,6 @@ Name: fish -Version: 3.1.2 -Release: 6%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: Friendly interactive shell # GPLv2 @@ -24,10 +24,19 @@ Summary: Friendly interactive shell # - user_doc/html/_static/underscore.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 -Source1: https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.gz.asc +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 +# Remove below patch when rebasing to next minor release +# https://src.fedoraproject.org/rpms/fish/pull-request/6#comment-69933 +# https://github.com/fish-shell/fish-shell/commit/29ebd4a5ff5c0a0eefe802a4bcaa8ef32cc5795a +Patch101: 0001-tests-Don-t-break-when-a-file-unexpectedly-exists.patch + +# Remove below patch when rebasing to next minor release +# https://github.com/fish-shell/fish-shell/commit/955c0003ca923dea76e9c953cda871d4209f028b +Patch102: 0001-fd_monitor-Explicity-include-thread.patch + BuildRequires: cmake >= 3.2 BuildRequires: ninja-build BuildRequires: gcc @@ -85,8 +94,8 @@ sed -i 's^/usr/local/^/usr/^g' %{_vpath_builddir}/*.pc %py_byte_compile %{python3} %{buildroot}%{_datadir}/%{name}/tools/ # Install docs from tarball root -cp -a README.md %{buildroot}%{_pkgdocdir} -cp -a CONTRIBUTING.md %{buildroot}%{_pkgdocdir} +cp -a README.rst %{buildroot}%{_pkgdocdir} +cp -a CONTRIBUTING.rst %{buildroot}%{_pkgdocdir} %find_lang %{name} @@ -118,8 +127,14 @@ fi %{_datadir}/fish/ %{_datadir}/pkgconfig/fish.pc %{_pkgdocdir} +%{_datadir}/applications/fish.desktop +%{_datadir}/pixmaps/fish.png %changelog +* Sat Mar 13 2021 Siteshwar Vashisht - 3.2.0-1 +- Update to 3.2.0 + Resolves: #1933886 + * Tue Jan 26 2021 Fedora Release Engineering - 3.1.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 5f8846f..baa6c7d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fish-3.1.2.tar.gz) = b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563 -SHA512 (fish-3.1.2.tar.gz.asc) = ebfc1d4b7ef3db0d11ef59019bbe2e742adf368dfaa28f630c7982b957f4069d6aee70a856d4c922e554ff19ad9fec54554486cd03c3c463d9dd8c35c8e7680c +SHA512 (fish-3.2.0.tar.xz.asc) = cfa8f3f0463fc60e340ddf17848f5ef94acbb8aece0a5629a4cb846affbaa563052ae65e0505fb3c632136a1cc771023496720e6a28a94122dd133221cbe7072 +SHA512 (fish-3.2.0.tar.xz) = 4525b8dd991179f77a298080d389813d1da8557bd394d174ded9238570715137e3aeec009d123811b34c07856d5f7cbe0ad35dc599d748f8f305036c3b74face From 20f16f4f92227ca9ecb4135f927082b34c2e3d89 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Mar 13 2021 18:42:48 +0000 Subject: [PATCH 3/9] Check desktop file via desktop-file-validate Signed-off-by: Igor Raits --- diff --git a/fish.spec b/fish.spec index 5f2860c..046b00f 100644 --- a/fish.spec +++ b/fish.spec @@ -47,6 +47,7 @@ BuildRequires: pcre2-devel BuildRequires: gnupg2 BuildRequires: python3-devel %global __python %{__python3} +BuildRequires: /usr/bin/desktop-file-validate # tab completion wants man-db Recommends: man-db @@ -101,6 +102,7 @@ cp -a CONTRIBUTING.rst %{buildroot}%{_pkgdocdir} %check %{_vpath_builddir}/fish_tests +desktop-file-validate %{buildroot}%{_datadir}/applications/fish.desktop %post if [ "$1" = 1 ]; then From 2beca886dbf3b2136a12957d06d4d984d27cc1d2 Mon Sep 17 00:00:00 2001 From: Siteshwar Vashisht Date: Mar 18 2021 12:08:02 +0000 Subject: [PATCH 4/9] Update to 3.2.1 Resolves: #1940398 --- diff --git a/.gitignore b/.gitignore index f795c0a..14736aa 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ /fish-3.1.2.tar.gz.asc /fish-3.2.0.tar.xz /fish-3.2.0.tar.xz.asc +/fish-3.2.1.tar.xz.asc +/fish-3.2.1.tar.xz diff --git a/0001-fd_monitor-Explicity-include-thread.patch b/0001-fd_monitor-Explicity-include-thread.patch deleted file mode 100644 index 43d8100..0000000 --- a/0001-fd_monitor-Explicity-include-thread.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 955c0003ca923dea76e9c953cda871d4209f028b Mon Sep 17 00:00:00 2001 -From: Fabian Homborg -Date: Tue, 2 Mar 2021 15:27:13 +0100 -Subject: [PATCH] fd_monitor: Explicity include - -Might fix issues with gcc 11.0.1. - -See #7764. ---- - src/fd_monitor.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/fd_monitor.cpp b/src/fd_monitor.cpp -index a55e9c55f..2ed2ca4de 100644 ---- a/src/fd_monitor.cpp -+++ b/src/fd_monitor.cpp -@@ -4,6 +4,7 @@ - #include "fd_monitor.h" - - #include -+#include //this_thread::sleep_for - - #include "flog.h" - #include "io.h" --- -2.29.2 - diff --git a/0001-tests-Don-t-break-when-a-file-unexpectedly-exists.patch b/0001-tests-Don-t-break-when-a-file-unexpectedly-exists.patch deleted file mode 100644 index 8d8591f..0000000 --- a/0001-tests-Don-t-break-when-a-file-unexpectedly-exists.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 29ebd4a5ff5c0a0eefe802a4bcaa8ef32cc5795a Mon Sep 17 00:00:00 2001 -From: Fabian Homborg -Date: Sat, 13 Mar 2021 17:22:35 +0100 -Subject: [PATCH] tests: Don't break when a file unexpectedly exists - -Creating a file called "xfoo" could break the highlight tests because -we'd suddenly get a color with valid_path set to true. - -So what we do is simply compare foreground/background and forced -underline, but only check for path validity if we're expecting a valid -path. - -If we're not expecting a valid path, we don't fail whether it is there -or not. - -This means that we can't check for a non-valid path, but we don't -currently do that anyway and we can just burn that bridge when we get -to it. - -cc @siteshwar @krobelus, who both came across this ---- - src/fish_tests.cpp | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp -index 5f57f9e64..3f7777138 100644 ---- a/src/fish_tests.cpp -+++ b/src/fish_tests.cpp -@@ -5386,7 +5386,16 @@ static void test_highlighting() { - // Hackish space handling. We don't care about the colors in spaces. - if (text.at(i) == L' ') continue; - -- if (expected_colors.at(i) != colors.at(i)) { -+ auto e = expected_colors.at(i); -+ auto c = colors.at(i); -+ // Compare the colors, but don't care about pathness -+ // unless we're asking for a valid path. -+ // -+ // That way stray files in the build directory don't break the test. -+ if (e.foreground != c.foreground -+ || e.background != c.background -+ || e.force_underline != c.force_underline -+ || (e.valid_path && !c.valid_path)) { - const wcstring spaces(i, L' '); - err(L"Wrong color in test at index %lu in text (expected %#x, actual " - L"%#x):\n%ls\n%ls^", --- -2.29.2 - diff --git a/fish.spec b/fish.spec index 046b00f..cb8f2f1 100644 --- a/fish.spec +++ b/fish.spec @@ -1,5 +1,5 @@ Name: fish -Version: 3.2.0 +Version: 3.2.1 Release: 1%{?dist} Summary: Friendly interactive shell @@ -28,15 +28,6 @@ Source0: https://github.com/fish-shell/fish-shell/releases/download/%{ver Source1: https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.xz.asc Source2: gpgkey-003837986104878835FA516D7A67D962D88A709A.gpg -# Remove below patch when rebasing to next minor release -# https://src.fedoraproject.org/rpms/fish/pull-request/6#comment-69933 -# https://github.com/fish-shell/fish-shell/commit/29ebd4a5ff5c0a0eefe802a4bcaa8ef32cc5795a -Patch101: 0001-tests-Don-t-break-when-a-file-unexpectedly-exists.patch - -# Remove below patch when rebasing to next minor release -# https://github.com/fish-shell/fish-shell/commit/955c0003ca923dea76e9c953cda871d4209f028b -Patch102: 0001-fd_monitor-Explicity-include-thread.patch - BuildRequires: cmake >= 3.2 BuildRequires: ninja-build BuildRequires: gcc @@ -133,6 +124,10 @@ fi %{_datadir}/pixmaps/fish.png %changelog +* Thu Mar 18 2021 Siteshwar Vashisht - 3.2.1-1 +- Update to 3.2.1 + Resolves: #1940398 + * Sat Mar 13 2021 Siteshwar Vashisht - 3.2.0-1 - Update to 3.2.0 Resolves: #1933886 diff --git a/sources b/sources index baa6c7d..1622ee9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fish-3.2.0.tar.xz.asc) = cfa8f3f0463fc60e340ddf17848f5ef94acbb8aece0a5629a4cb846affbaa563052ae65e0505fb3c632136a1cc771023496720e6a28a94122dd133221cbe7072 -SHA512 (fish-3.2.0.tar.xz) = 4525b8dd991179f77a298080d389813d1da8557bd394d174ded9238570715137e3aeec009d123811b34c07856d5f7cbe0ad35dc599d748f8f305036c3b74face +SHA512 (fish-3.2.1.tar.xz.asc) = b87622b3f0e761e555611c6fc0bb5d11028e240add7f15320101fd117bda2113d937218ba79b58d7674780a4f246e8da3c2a093ecb08da77d7f7e2df3b6ea62a +SHA512 (fish-3.2.1.tar.xz) = bf565bac93e7d163af5253b4053f9c9e760508b929624440fd8a160504a127c34013882576293c72a47ce7f285f87e0b594d61d7cebcefcc3be4e92c572926bc From ca90327b542b3f829c558024a67ea8da548889c1 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mar 30 2021 18:36:04 +0000 Subject: [PATCH 5/9] Rebuilt for removed libstdc++ symbol (#1937698) --- diff --git a/fish.spec b/fish.spec index cb8f2f1..ca0d60e 100644 --- a/fish.spec +++ b/fish.spec @@ -1,6 +1,6 @@ Name: fish Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Friendly interactive shell # GPLv2 @@ -124,6 +124,9 @@ fi %{_datadir}/pixmaps/fish.png %changelog +* Tue Mar 30 2021 Jonathan Wakely - 3.2.1-2 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Thu Mar 18 2021 Siteshwar Vashisht - 3.2.1-1 - Update to 3.2.1 Resolves: #1940398 From 729e02cd92faf588f6db25b101a770e813e2b6d4 Mon Sep 17 00:00:00 2001 From: Siteshwar Vashisht Date: Jul 01 2021 11:16:56 +0000 Subject: [PATCH 6/9] Update to 3.3.0 Resolves: #1947062 --- diff --git a/.gitignore b/.gitignore index 14736aa..a4432e3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /fish-3.2.0.tar.xz.asc /fish-3.2.1.tar.xz.asc /fish-3.2.1.tar.xz +/fish-3.3.0.tar.xz +/fish-3.3.0.tar.xz.asc diff --git a/fish.spec b/fish.spec index ca0d60e..e91df9e 100644 --- a/fish.spec +++ b/fish.spec @@ -1,6 +1,6 @@ Name: fish -Version: 3.2.1 -Release: 2%{?dist} +Version: 3.3.0 +Release: 1%{?dist} Summary: Friendly interactive shell # GPLv2 @@ -124,6 +124,10 @@ fi %{_datadir}/pixmaps/fish.png %changelog +* Thu Jul 01 2021 Siteshwar Vashisht - 3.3.0-1 +- Update to 3.3.0 + Resolves: #1947062 + * Tue Mar 30 2021 Jonathan Wakely - 3.2.1-2 - Rebuilt for removed libstdc++ symbol (#1937698) diff --git a/sources b/sources index 1622ee9..aac2cc3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fish-3.2.1.tar.xz.asc) = b87622b3f0e761e555611c6fc0bb5d11028e240add7f15320101fd117bda2113d937218ba79b58d7674780a4f246e8da3c2a093ecb08da77d7f7e2df3b6ea62a -SHA512 (fish-3.2.1.tar.xz) = bf565bac93e7d163af5253b4053f9c9e760508b929624440fd8a160504a127c34013882576293c72a47ce7f285f87e0b594d61d7cebcefcc3be4e92c572926bc +SHA512 (fish-3.3.0.tar.xz) = dd2288e93e5da9e34c6dcb4cb9accc164cb2b244d99e0b8df1f141789ba7e12b533cd2dc221bc42b96e1329daaba7f03b98e2f6111c558a887edb7047e8990cb +SHA512 (fish-3.3.0.tar.xz.asc) = 13d231a03d4e0069f4039d71bab1612472621c4c15492be6c4a03f180cb16af2af6a43e6c91bd795afcdfd3293f996f8626cc00930499e615f28c5296c6a0e2a From e0ac155f72c8ef381c8c8897111144e27e99410b Mon Sep 17 00:00:00 2001 From: Siteshwar Vashisht Date: Jul 07 2021 10:45:50 +0000 Subject: [PATCH 7/9] Update to 3.3.1 Resolves: #1979734 --- diff --git a/.gitignore b/.gitignore index a4432e3..68f018f 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ /fish-3.2.1.tar.xz /fish-3.3.0.tar.xz /fish-3.3.0.tar.xz.asc +/fish-3.3.1.tar.xz +/fish-3.3.1.tar.xz.asc diff --git a/fish.spec b/fish.spec index e91df9e..b1ed74b 100644 --- a/fish.spec +++ b/fish.spec @@ -1,5 +1,5 @@ Name: fish -Version: 3.3.0 +Version: 3.3.1 Release: 1%{?dist} Summary: Friendly interactive shell @@ -124,6 +124,10 @@ fi %{_datadir}/pixmaps/fish.png %changelog +* Wed Jul 07 2021 Siteshwar Vashisht - 3.3.1-1 +- Update to 3.3.1 + Resolves: #1979734 + * Thu Jul 01 2021 Siteshwar Vashisht - 3.3.0-1 - Update to 3.3.0 Resolves: #1947062 diff --git a/sources b/sources index aac2cc3..04eb856 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fish-3.3.0.tar.xz) = dd2288e93e5da9e34c6dcb4cb9accc164cb2b244d99e0b8df1f141789ba7e12b533cd2dc221bc42b96e1329daaba7f03b98e2f6111c558a887edb7047e8990cb -SHA512 (fish-3.3.0.tar.xz.asc) = 13d231a03d4e0069f4039d71bab1612472621c4c15492be6c4a03f180cb16af2af6a43e6c91bd795afcdfd3293f996f8626cc00930499e615f28c5296c6a0e2a +SHA512 (fish-3.3.1.tar.xz) = fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660 +SHA512 (fish-3.3.1.tar.xz.asc) = 1757ef4c93b302fe86f669d3549884d9e6f265b45be1945ec1c7551d2d0489b5f51dfe5c288f5b415f905f0ad1d9d0d1d304f08682459b171ac72a293651cc8a From 24ed2f6c35e6c4d4874499c5b301e6ecadf5ad3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Jul 21 2021 22:59:54 +0000 Subject: [PATCH 8/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- diff --git a/fish.spec b/fish.spec index b1ed74b..37af336 100644 --- a/fish.spec +++ b/fish.spec @@ -1,6 +1,6 @@ Name: fish Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Friendly interactive shell # GPLv2 @@ -124,6 +124,9 @@ fi %{_datadir}/pixmaps/fish.png %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jul 07 2021 Siteshwar Vashisht - 3.3.1-1 - Update to 3.3.1 Resolves: #1979734 From ec4a9ee52af3dddbfafcb85a31da8b312eb8edfd Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Jan 19 2022 20:51:01 +0000 Subject: [PATCH 9/9] Merge branch 'f35' into epel8 --- diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 --- a/.cvsignore +++ /dev/null diff --git a/.gitignore b/.gitignore index 50d05f0..68f018f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,21 @@ +/fish-2.1.0.tar.gz +/fish-2.1.1.tar.gz +/fish-2.2.0.tar.gz +/fish-2.3.0.tar.gz +/fish-2.3.1.tar.gz +/fish-2.6.0.tar.gz +/fish-2.7.1.tar.gz +/fish-3.0.0.tar.gz +/fish-3.0.2.tar.gz +/fish-3.1.0.tar.gz +/fish-3.1.0.tar.gz.asc /fish-3.1.2.tar.gz /fish-3.1.2.tar.gz.asc +/fish-3.2.0.tar.xz +/fish-3.2.0.tar.xz.asc +/fish-3.2.1.tar.xz.asc +/fish-3.2.1.tar.xz +/fish-3.3.0.tar.xz +/fish-3.3.0.tar.xz.asc +/fish-3.3.1.tar.xz +/fish-3.3.1.tar.xz.asc diff --git a/Makefile b/Makefile deleted file mode 100644 index c352225..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: fish -# $Id$ -NAME := fish -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/fish.spec b/fish.spec index 65d3b43..37af336 100644 --- a/fish.spec +++ b/fish.spec @@ -1,9 +1,5 @@ -# 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.1.2 +Version: 3.3.1 Release: 2%{?dist} Summary: Friendly interactive shell @@ -28,8 +24,9 @@ Summary: Friendly interactive shell # - user_doc/html/_static/underscore.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 -Source1: https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.gz.asc +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 BuildRequires: cmake >= 3.2 BuildRequires: ninja-build @@ -41,6 +38,7 @@ BuildRequires: pcre2-devel BuildRequires: gnupg2 BuildRequires: python3-devel %global __python %{__python3} +BuildRequires: /usr/bin/desktop-file-validate # tab completion wants man-db Recommends: man-db @@ -58,6 +56,7 @@ highlighting, autosuggestions, and tab completions that just work, with nothing to learn or configure. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 rm -vrf pcre2-* @@ -82,14 +81,19 @@ sed -i 's^/usr/local/^/usr/^g' %{_vpath_builddir}/*.pc %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 +%py_byte_compile %{python3} %{buildroot}%{_datadir}/%{name}/tools/ + # Install docs from tarball root -cp -a README.md %{buildroot}%{_pkgdocdir} -cp -a CONTRIBUTING.md %{buildroot}%{_pkgdocdir} +cp -a README.rst %{buildroot}%{_pkgdocdir} +cp -a CONTRIBUTING.rst %{buildroot}%{_pkgdocdir} %find_lang %{name} %check %{_vpath_builddir}/fish_tests +desktop-file-validate %{buildroot}%{_datadir}/applications/fish.desktop %post if [ "$1" = 1 ]; then @@ -116,13 +120,47 @@ fi %{_datadir}/fish/ %{_datadir}/pkgconfig/fish.pc %{_pkgdocdir} +%{_datadir}/applications/fish.desktop +%{_datadir}/pixmaps/fish.png %changelog -* Fri Aug 28 2020 Oliver Falk - 3.1.2-2 +* Wed Jul 21 2021 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 07 2021 Siteshwar Vashisht - 3.3.1-1 +- Update to 3.3.1 + Resolves: #1979734 + +* Thu Jul 01 2021 Siteshwar Vashisht - 3.3.0-1 +- Update to 3.3.0 + Resolves: #1947062 + +* Tue Mar 30 2021 Jonathan Wakely - 3.2.1-2 +- Rebuilt for removed libstdc++ symbol (#1937698) + +* Thu Mar 18 2021 Siteshwar Vashisht - 3.2.1-1 +- Update to 3.2.1 + Resolves: #1940398 + +* Sat Mar 13 2021 Siteshwar Vashisht - 3.2.0-1 +- Update to 3.2.0 + Resolves: #1933886 + +* Tue Jan 26 2021 Fedora Release Engineering - 3.1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Aug 25 2020 Oliver Falk - 3.1.2-5 - Correct pkgconfig references to /usr/local (RHBZ#1869376) -* Thu Jul 09 2020 Oliver Falk - 3.1.2-1 -- Build for EPEL-8 +* Mon Aug 17 2020 Artem Polishchuk - 3.1.2-4 +- Remove automagic Python bytecompilation | Fix FTBFS f33 | RH#1863559 + +* Sat Aug 01 2020 Fedora Release Engineering - 3.1.2-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 3.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Wed May 06 2020 Igor Raits - 3.1.2-1 - Update to 3.1.2 diff --git a/gpgkey-003837986104878835FA516D7A67D962D88A709A.gpg b/gpgkey-003837986104878835FA516D7A67D962D88A709A.gpg new file mode 100644 index 0000000..79c7b47 Binary files /dev/null and b/gpgkey-003837986104878835FA516D7A67D962D88A709A.gpg differ diff --git a/sources b/sources index 5f8846f..04eb856 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fish-3.1.2.tar.gz) = b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563 -SHA512 (fish-3.1.2.tar.gz.asc) = ebfc1d4b7ef3db0d11ef59019bbe2e742adf368dfaa28f630c7982b957f4069d6aee70a856d4c922e554ff19ad9fec54554486cd03c3c463d9dd8c35c8e7680c +SHA512 (fish-3.3.1.tar.xz) = fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660 +SHA512 (fish-3.3.1.tar.xz.asc) = 1757ef4c93b302fe86f669d3549884d9e6f265b45be1945ec1c7551d2d0489b5f51dfe5c288f5b415f905f0ad1d9d0d1d304f08682459b171ac72a293651cc8a