github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 12:04:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
15,779 Commits 35 Branches 80 Tags 115 MiB
7e09c6e72c
Commit Graph

78 Commits

Author SHA1 Message Date
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
David Adam
f4790a8767 fish.spec: check if %rhel is defined before expanding. 
Work on #5446.
 2019-01-05 20:27:06 +08:00
David Adam
4548f4f4b0 fish.spec: run all tests 2019-01-05 17:28:37 +08:00
Benjamin Nied
eabda835d5 fish.spec: switch to using a common rpm macro 
CentOS 7 does not have rhel_version as one of its macros, so trying to
build results in CMake errors, since we get `cmake` instead of
`cmake3`. These additional conditions allow the spec to build
successfully on CentOS 7.

Using %rhel should allow one set of conditionals to work across CentOS 7
and RHEL 7.

This has been tested on both.
 2019-01-04 21:16:51 +08:00
David Adam
7191a42ca0 fish.spec: turn the BUILD_SHARED_LIBS option off 
PCRE2 should only be built as a static library.

Closes #5448.
 2019-01-02 21:38:30 +08:00
David Adam
6783c63eee fish.spec: tidy up extra CMake arguments 2019-01-02 21:36:55 +08:00
David Adam
32e6bf6f64 debian packaging/fish.spec: drop bc dependency 2018-12-29 23:16:09 +08:00
David Adam
7abfd1db30 fish.spec: drop hostname dependency 2018-11-12 21:46:08 +08:00
David Adam
725062d360 fish.spec: switch to cmake builds 2018-05-29 13:46:14 +08:00
David Adam
1872fb4ea9 fish.spec: depend on system pcre2 libraries where available 2017-08-26 00:16:29 +08:00
Fabian Homborg
702de29549 fish.spec.in: Remove which dependency 
Also changelog
 2017-04-08 13:25:26 +02:00
David Adam
40de253b3a Upgrade git:// and http:// URLs to https:// 
Work on fish-shell/fish-site#47

[ci skip]
 2017-02-17 21:31:44 +08:00
David Adam
47b78b9eeb fish.spec: on OBS/RHEL 5, build with -march=i686 
RHEL 5 defaults to the i386 architecture, which does not provide the
atomic instructions required by C++11.
 2016-12-16 09:33:26 +08:00
David Adam
0ba02ee3d1 fish.spec: on OBS, print config.log if configure unsuccessful 2016-12-14 16:43:22 +08:00
David Adam
599089de80 fish.spec: add dependency on newer GCC on old platforms 
Moving to C++11 requires a newer compiler on old systems; our Open Build
Service repository has a newer version available for RHEL 5 & 6 builds.
 2016-12-11 16:58:15 +08:00
David Adam
75064ed786 fish.spec: hostname dependency for openSUSE 
As discussed in
ed4b78918a

[ci skip]
 2016-04-28 08:20:58 +08:00
David Adam
ed4b78918a fish.spec: dependency on net-tools/hostname depending on platform 
Closes #2190.

[ci skip]
 2016-03-06 19:24:19 +08:00
David Adam
9c2fdc6da5 fish.spec.in: re-add to source treee 
Imported from https://github.com/zanchey/fish-build/

Work on #2020.

Note that this is explicitly removed from `git archive` tarballs in
keeping with the changes in 0effcf6df1.
 2015-07-24 10:58:30 +08:00