Skip to content
Snippets Groups Projects
Unverified Commit 6955d680 authored by Sébastien Blin's avatar Sébastien Blin Committed by Amin Bandali
Browse files

packaging: use gcc10 for 'opensuse/leap:15.3'

* docker/Dockerfile_opensuse-leap_15.3: The 'opensuse/leap:15.3'
docker image doesn't seem to have gcc11, so use gcc10 instead.
* packaging/rules/rpm/jami-gnome.spec: Unconditionally require
'make' for build, and require 'cmake' only where a recent enough
version is available in the distro (otherwise, we grab and use
external cmake e.g. using 'scripts/install-cmake.sh').

jami-packaging#111


Co-authored-by: default avatarAmin Bandali <amin.bandali@savoirfairelinux.com>
Change-Id: I5686f8e5d77eb8108b1581a33a2432006a1a688b
parent ebe0ec02
No related branches found
No related tags found
No related merge requests found
......@@ -6,8 +6,8 @@ RUN zypper --non-interactive install -y \
rpmdevtools \
Mesa-dri-devel Mesa-dri \
git \
gcc11 \
gcc11-c++ \
gcc10 \
gcc10-c++ \
rpm-build \
tar \
make \
......@@ -92,8 +92,8 @@ RUN zypper --non-interactive install -y \
ninja \
wget
RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 50
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 50
RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 50
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 50
# Install CMake 3.19 for Qt 6
ADD scripts/install-cmake.sh /opt/install-cmake.sh
......
......@@ -14,14 +14,14 @@ Source: jami_%{version}.tar.gz
Requires: jami-libclient = %{version}
# Build dependencies.
BuildRequires: cmake
BuildRequires: make
BuildRequires: gettext-devel
# Build and runtime dependencies.
BuildRequires: glib2-devel
%if 0%{?fedora} >= 32
BuildRequires: gcc
BuildRequires: make
BuildRequires: cmake
BuildRequires: dbus-devel
BuildRequires: libnotify-devel
BuildRequires: libappindicator-gtk3-devel
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment