diff --git a/Makefile b/Makefile index c4679d74c994501d36097a7f06e49d6fc2eb0298..bdfdd2c92cb20bfe830d77c2318eb9ba0d175b03 100644 --- a/Makefile +++ b/Makefile @@ -166,6 +166,7 @@ DISTRIBUTIONS := \ fedora_35 \ fedora_36 \ opensuse-leap_15.3 \ + opensuse-leap_15.4 \ snap IS_SHELL_INTERACTIVE := $(shell [ -t 0 ] && echo yes) diff --git a/docker/Dockerfile_opensuse-leap_15.4 b/docker/Dockerfile_opensuse-leap_15.4 new file mode 100644 index 0000000000000000000000000000000000000000..9d6a93ab38495e06bf63650e62577c6d46846b3b --- /dev/null +++ b/docker/Dockerfile_opensuse-leap_15.4 @@ -0,0 +1,106 @@ +FROM opensuse/leap:15.4 + +RUN zypper --non-interactive install -y \ + dnf \ + dnf-command\(builddep\) \ + rpmdevtools \ + Mesa-dri-devel Mesa-dri \ + git \ + gcc10 \ + gcc10-c++ \ + rpm-build \ + tar \ + make \ + autoconf \ + automake \ + nasm \ + speexdsp-devel \ + libpulse-devel \ + libcanberra-devel \ + libcurl-devel \ + libtool \ + pcre-devel \ + yaml-cpp-devel \ + libdbus-c++-devel \ + libXext-devel \ + libXfixes-devel \ + yasm \ + speex-devel \ + libgsm-devel \ + chrpath \ + check \ + astyle \ + gettext-devel \ + which \ + alsa-lib-devel \ + systemd-devel \ + libuuid-devel \ + uuid-devel \ + libopus-devel \ + patch \ + jsoncpp-devel \ + webkit2gtk3-devel \ + libcryptopp-devel \ + libva-devel \ + libvdpau-devel \ + msgpack-devel \ + clutter-devel \ + clutter-gtk-devel \ + libnma-devel \ + libcryptopp-devel \ + libdbus-c++-devel \ + libexpat-devel \ + gnome-icon-theme-symbolic \ + libgsm-devel \ + gtk3-devel \ + libappindicator-devel \ + sqlite-devel \ + ffmpeg-4-libavutil-devel \ + gtk3-devel\ + qrencode-devel \ + python3-python-dateutil \ + libsndfile-devel \ + libdrm \ + gperf \ + bison \ + flex \ + ffmpeg ffmpeg-devel \ + nodejs12 \ + mozilla-nss-devel \ + python-xml \ + libxcb* \ + libxkb* \ + libX11-devel \ + libXrender-devel \ + libfreetype6 \ + xcb-util-image-devel \ + xcb-util-keysyms-devel \ + xcb-util-renderutil-devel \ + xcb-util-wm-devel \ + xorg-x11-devel \ + xz \ + xkeyboard-config \ + libnotify \ + argon2-devel \ + libxshmfence-devel \ + xproto-devel \ + xcb-proto-devel \ + xcb-* \ + xorg-* \ + vulkan-devel \ + ninja \ + gstreamer-devel \ + gstreamer-plugins-good \ + gstreamer-plugins-bad-devel \ + gstreamer-plugins-base-devel \ + cmake \ + wget + +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 + +ADD scripts/build-package-rpm.sh /opt/build-package-rpm.sh + +ENV CC=gcc +ENV CXX=g++ +CMD ["/opt/build-package-rpm.sh"] diff --git a/packaging/rules/rpm/jami-daemon.spec b/packaging/rules/rpm/jami-daemon.spec index c582a96ee07d7d35a5c9bcf91f6bf5039e42c2c0..8922bbf5a95d85591d53b07226e0be5c9bcfd2ed 100644 --- a/packaging/rules/rpm/jami-daemon.spec +++ b/packaging/rules/rpm/jami-daemon.spec @@ -39,9 +39,10 @@ BuildRequires: libdbus-c++-devel BuildRequires: libexpat-devel BuildRequires: libopus-devel BuildRequires: libpulse-devel +%else +BuildRequires: gnutls-devel %endif BuildRequires: alsa-lib-devel -BuildRequires: gnutls-devel BuildRequires: jsoncpp-devel BuildRequires: libXext-devel BuildRequires: libXfixes-devel