h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-07 01:51:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

fish.spec: switch to using a common rpm macro

Browse Source 
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.
This commit is contained in:
Benjamin Nied
2018-12-30 08:23:33 -08:00
committed by David Adam
parent 9d4e460b29
commit eabda835d5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fish.spec.in
View File

@@ -11,13 +11,13 @@ URL: https://fishshell.com/
Source0: %{name}_@VERSION@.orig.tar.gz Source0: %{name}_@VERSION@.orig.tar.gz
BuildRequires: ncurses-devel gettext gcc-c++ autoconf BuildRequires: ncurses-devel gettext gcc-c++ autoconf
%if 0%{?rhel_version} && 0%{?rhel_version} && 0%{?rhel_version} < 800 %if 0%{?rhel} < 8
BuildRequires: cmake3 BuildRequires: cmake3
%else %else
BuildRequires: cmake BuildRequires: cmake
%endif %endif
%if 0%{?opensuse_bs} && 0%{?rhel_version} && 0%{?rhel_version} < 700 %if 0%{?opensuse_bs} && 0%{?rhel} < 7
BuildRequires: gcc48 gcc48-c++ BuildRequires: gcc48 gcc48-c++
%endif %endif
@@ -40,7 +40,7 @@ is simple but incompatible with other shell languages.
%setup -q -n %{name}-@VERSION@ %setup -q -n %{name}-@VERSION@
%build %build
%if 0%{?opensuse_bs} && 0%{?rhel_version} && 0%{?rhel_version} < 700 %if 0%{?opensuse_bs} && 0%{?rhel} < 7
export CC=gcc48 export CC=gcc48
export CXX=g++48 export CXX=g++48
EXTRA_CMAKE_FLAGS="-DCURSES_EXTRA_LIBRARY=tinfo" EXTRA_CMAKE_FLAGS="-DCURSES_EXTRA_LIBRARY=tinfo"
@@ -54,7 +54,7 @@ export CXXFLAGS="$CXXFLAGS -march=i686"
EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DBUILD_SHARED_LIBS:BOOL=OFF" EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DBUILD_SHARED_LIBS:BOOL=OFF"
# CMake macros define the wrong sysconfdir arguments # CMake macros define the wrong sysconfdir arguments
EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}" EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}"
%if 0%{?rhel_version} && 0%{?rhel_version} < 800 %if 0%{?rhel} < 8
%cmake3 $EXTRA_CMAKE_FLAGS %cmake3 $EXTRA_CMAKE_FLAGS
%else %else
%cmake $EXTRA_CMAKE_FLAGS %cmake $EXTRA_CMAKE_FLAGS