Commit graph

95 commits

Author SHA1 Message Date
David Adam
a23cd62ec7 RPM/Debian packaging: update dependencies to match reality 2024-12-15 23:53:55 +08:00
David Adam
3a9dc12a31 fish.spec: drop C++ requirement 2024-06-12 14:14:52 +08:00
David Adam
cc2fb5c07c fish.spec: drop RHEL/CentOS support
Discussed on https://github.com/fish-shell/fish-shell/issues/10453
2024-04-30 23:36:56 +08:00
David Adam
572aece169 RPM/Debian packaging: Rust build support 2024-04-30 23:36:56 +08:00
Fabian Boehm
16fcc5de7c Increase MSRV to 1.70
It appears we can't find a system that ships rustc >= 1.67 and < 1.70,
so keeping it at 1.67 gains nothing.

1.70 is used in Debian 13, so that will be able to build fish out of
the box (12 was on 1.63 which was already too low).
2024-04-29 22:00:59 +02:00
Fabian Boehm
6eaaa3adc3 Revert "Try to fix OBS tumbleweed builds"
This was a misunderstanding, the OBS tumbleweed builds build from a tarball that's pushed manually.

We no longer use corrosion so this dependency is unused.

This reverts commit bdde2b2b35.

Fixes #10391
2024-03-23 11:51:19 +01:00
Mahmoud Al-Qudsi
bdde2b2b35 Try to fix OBS tumbleweed builds
Add git as a build requirement. Package name guessed then confirmed by searching
on rpm.pbone.net against openSUSE Tumbleweed.

Log excerpt:

[   14s] CMake Error at /usr/share/cmake/Modules/ExternalProject.cmake:2910 (message):
[   14s]   error: could not find git for clone of corrosion-populate
2024-03-22 22:42:58 -05:00
David Adam
9105d6a82f fish.spec: better installation of documentation
The %{_docdir} macro is defined, but due to an oversight is not passed
to CMake in some versions of openSUSE where it should be.

Use doc directives to avoid mucking around with cp.
2024-03-21 22:45:57 +08:00
David Adam
b64c210ade fish.spec: fix documentation path on OpenSUSE
(It's a shame the _docdir macro is unusuable, but even downstream
doesn't use it.)
2024-03-20 23:45:51 +08:00
Fabian Boehm
f62f1aaf99 Remove remaining mentions of curses 2024-02-23 16:36:10 +01:00
David Adam
2cb608358d fish.spec/Debian packaging: update licensing details 2023-05-25 22:23:18 +08:00
David Adam
733b981983 fish.spec/Debian packaging: add cargo dependency 2023-04-07 12:45:24 +08:00
David Adam
8c645186c0 fish.spec: replace tabs with spaces 2023-04-07 12:22:34 +08:00
David Adam
340db7f7d3 fish.spec/debian packaging: add initial Rust dependencies 2023-02-12 22:53:14 +08:00
David Adam
fb3056d7a1 fish.spec: drop long-obsolete BuildRoot directive
Ignored since RPM 4.6.0, released in 2009!
2023-02-01 22:26:30 +08:00
David Adam
c3c8cf1e01 fish.spec: depend on system pcre2 libraries on all platforms
These are now available on all supported platforms, and the download
process tends to break on build workers (where Internet access is
deliberately denied).
2022-07-10 10:43:14 +08:00
David Adam
2def146c67 fish.spec: use all available macros to find build location
Fixes the build on all active platforms.
2022-06-08 22:45:55 +08:00
David Adam
7e09c6e72c Revert "fish.spec: use cmake macros to run tests if available"
This reverts commit d25c57ae05.

The cmake_build macro on SUSE doesn't call CMake directly.
2022-06-08 21:47:33 +08:00
David Adam
d25c57ae05 fish.spec: use cmake macros to run tests if available 2022-06-08 21:05:25 +08:00
David Adam
efe4083dce fish.spec/.builds: drop SHOW_INTERACTIVE_LOG
This was only used with expect, which is long gone from the codebase.
2022-06-08 18:37:35 +08:00
David Adam
26bf77962b fish.spec: use fish_run_tests as test target
Old version of CMake seem to have trouble connecting the standard test
target with the need to build the fish_tests binary; use the target that
has been added specifically for this purpose instead.
2022-06-08 18:30:30 +08:00
David Adam
2a22a2e4e4 Revert "fish.spec: add SUSE depends on ncurses-utils eg tput"
This reverts commit b5823ac5e1.

tput is only required as a fallback for backward compatibility.
2021-03-28 16:15:32 +08:00
David Adam
b5823ac5e1 fish.spec: add SUSE depends on ncurses-utils eg tput 2021-03-27 23:11:03 +08:00
David Adam
63fa8dfd26 fish.spec: drop RHEL 6 elements
RHEL/CentOS 6 are now out of support by upstream and fish.
2021-03-01 22:16:01 +08:00
David Adam
80618599f9 fish.spec: correct a syntax error
Fixup of ff144a3
2020-11-12 21:50:34 +08:00
David Adam
ff144a38d0 fish.spec: correctly test for macro existence
Fixup of a97566b
2020-11-12 18:09:44 +08:00
David Adam
a97566b6f1 fish.spec: switch to %cmake_build macro when available
Should fix the build on Fedora 33.
2020-11-12 14:59:02 +08:00
David Adam
7b5160e676 fish.spec: build depends on procps to support new jobs tests 2020-07-27 22:21:37 +08:00
David Adam
bc68ada893 fish.spec: drop _docdir entirely
The _docdir and _pkgdocdir macros are too variable between systems, and
the CMake macros do not use them at all; define the path directly.
2020-06-17 20:59:17 +08:00
David Adam
897bd62adf fish.spec: use _docdir macro more reliably
_pkgdocdir contains the version on some platforms but not others.
2020-06-16 07:09:39 +08:00
David Adam
b1b5f5f0ba fish.spec: drop fish-internal mandir, already included elsewhere
Fixes "File listed twice" warnings.
2020-06-16 07:09:39 +08:00
David Adam
68db32255a fish.spec: build depends on Python 3 on all platforms except RHEL 6 2020-06-12 23:54:29 +08:00
David Adam
71f7a3abf4 fish.spec: override overzealous version format linting 2020-06-11 17:23:23 +08:00
Fabian Homborg
382595e1e9 Update some .md references 2020-05-30 10:07:21 +02:00
David Adam
7206be3e47 fish.spec: stop running tests on RHEL 6
Due to RHEL's very old Python and other issues, keeping the tests
running is more work than it's worth. Switch to making sure the compiled
binary runs only.
2020-04-01 17:17:16 +08:00
David Adam
2f8c6f35b9 fish.spec: tidy up documentation entries 2020-02-18 22:02:13 +08:00
David Adam
4da44c7421 fish.spec: drop autoconf requirement, which is long gone 2020-02-14 22:44:59 +08:00
David Adam
0be93bead7 fish.spec: move to XZ compression
Work on #5460.
2020-02-14 22:44:30 +08:00
David Adam
38d530bc5b fish.spec: bump Python requirement to 3 on non-RHEL 6/7 platforms.
Work on #6537.
2020-02-13 23:18:43 +08:00
David Adam
21f2628c06 fish.spec: group conditionals to correctly detect Fedora
Fixes test failures due to glibc-langpack-en not being installed.
2020-02-06 13:15:49 +08:00
David Adam
0e75bcc61f fish.spec/debian packaging: add build dependency on Python
For littlecheck etc.
2020-01-28 16:55:05 +08:00
David Adam
1aa0dfe91b fish.spec: remove "Shell" FreeDesktop category, even from OpenSUSE
It's reserved and causes errors trying to build the AppImage.
2020-01-26 21:36:02 +08:00
David Adam
dc1ed1abf9 fish.spec: add overrides for FreeDesktop file on SUSE 2020-01-25 22:34:42 +08:00
David Adam
d910bada82 fish.spec: include FreeDesktop entry in file lists 2020-01-25 18:04:14 +08:00
David Adam
d90a62c151 fish.spec: depend on Python on CentOS/RHEL 8 for tests 2019-12-03 15:05:38 +08:00
David Adam
1f6f1b347c fish.spec: use system pcre2 on all platforms except RHEL 6/7 2019-12-03 14:47:52 +08:00
David Adam
a3fa011ef5 fish.spec: BuildRequire python-argparse on RHEL/CentOS 6 2019-08-08 14:10:11 +08:00
Siteshwar Vashisht
aa32fc92ac packaging: Disable expect based tests
`expect` based tests fail randomly and can cause build failures. Do not
run them while doing package builds.
2019-01-28 19:28:56 +08:00
David Adam
455959ae7a fish.spec: run tests with SHOW_INTERACTIVE_LOG=1 2019-01-12 00:06:27 +08:00
David Adam
896d6f41f4 fish.spec: drop stanza for RHEL 5
CentOS / Red Hat Enterprise Linux 5 are end-of-life and builds are not
made for these platforms any more.
2019-01-05 20:27:57 +08:00