submodules: update nightly branch

Makefile.packaging

@@ -124,6 +124,8 @@ package-all: package-debian_9 \
              package-fedora_30_i386 \
              package-fedora_31 \
              package-fedora_31_i386 \
+             package-fedora_32 \
+             package-fedora_32_i386 \
              package-rhel_8 \
              package-opensuse-leap_15.1 \
              package-gentoo

client-gnome @ 64a25fea

-Subproject commit abe6109242ebbdcf6b609800d1ccc36ba765382a
+Subproject commit 64a25feab9353b8137d66459c380c644fa77ce08

daemon @ 52cea6a2

-Subproject commit d931f140f13c861eee1f9d4bee8252d6a7d05192
+Subproject commit 52cea6a2dcf29785df4dcbbedcd74fe6241ff6ac

docker/Dockerfile_fedora_32

+FROM fedora:32
+
+RUN dnf clean all
+RUN dnf install -y dnf-command\(builddep\) rpmdevtools
+
+RUN dnf clean all
+RUN dnf upgrade -y && \
+    dnf install -y mesa-libgbm-devel mesa-dri-drivers && \
+    dnf install -y libinput-devel && \
+    dnf install -y \
+        git \
+        rpm-build \
+        tar \
+        make \
+        autoconf \
+        automake \
+        cmake \
+        speexdsp-devel \
+        pulseaudio-libs-devel \
+        libcanberra-devel \
+        libcurl-devel \
+        libtool \
+        dbus-devel \
+        expat-devel \
+        pcre-devel \
+        yaml-cpp-devel \
+        boost-devel \
+        dbus-c++-devel \
+        dbus-devel \
+        libXext-devel \
+        libXfixes-devel \
+        yasm \
+        nasm \
+        speex-devel \
+        gsm-devel \
+        chrpath \
+        check \
+        astyle \
+        uuid-c++-devel \
+        gettext-devel \
+        gcc-c++ \
+        which \
+        alsa-lib-devel \
+        systemd-devel \
+        libuuid-devel \
+        uuid-devel \
+        gnutls-devel \
+        nettle-devel \
+        opus-devel \
+        patch \
+        jsoncpp-devel \
+        libnatpmp-devel \
+        webkitgtk4-devel \
+        cryptopp-devel \
+        libva-devel \
+        libvdpau-devel \
+        msgpack-devel \
+        NetworkManager-libnm-devel \
+        openssl-devel \
+        openssl-static \
+        clutter-devel \
+        clutter-gtk-devel \
+        libappindicator-gtk3-devel \
+        libnotify-devel \
+        libupnp-devel \
+        qrencode-devel \
+        qt5-qtbase-devel \
+        qt5-qttools-devel \
+        sqlite-devel
+
+ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
+
+CMD /opt/build-package-fedora.sh

lrc @ 70255cb4

-Subproject commit ea8140fc81124b89f3ccc0523b740fe0e8aff289
+Subproject commit 70255cb4e6748461b56138fbb370d82f8d6137dc

packaging/rules/fedora/jami-all.postinst

@@ -105,6 +105,8 @@ enabled=1'
         ENDTAG="fedora_30"
     elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then
         ENDTAG="fedora_31"
+    elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
+        ENDTAG="fedora_32"
     else
         # Distribution is not supported. Don't provide automatic updates.
         CAN_ADD_YUM_SOURCE=false

packaging/rules/opensuse-leap/jami-all.postinst

@@ -105,6 +105,8 @@ enabled=1'
         ENDTAG="fedora_30"
     elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then
         ENDTAG="fedora_31"
+    elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
+        ENDTAG="fedora_32"
     elif [ "${PLATFORM_ID}" = "opensuse-leap:15.1" ] || [ "${ID}_${VERSION_ID}" = "opensuse-leap_15.1" ]; then
         ENDTAG="opensuse-leap_15.1"
 	REPO_FILE="/etc/zypp/repos.d/jami-main.repo"

packaging/rules/rhel/jami-all.postinst

@@ -97,6 +97,8 @@ enabled=1'
         ENDTAG="rhel_8"
     elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then
         ENDTAG="fedora_31"
+    elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
+        ENDTAG="fedora_32"
     else
         # Distribution is not supported. Don't provide automatic updates.
         CAN_ADD_YUM_SOURCE=false

scripts/build-package-fedora.sh

@@ -35,8 +35,15 @@ rpmdev-setuptree
 cp /opt/ring-project-ro/jami_*.tar.gz /root/rpmbuild/SOURCES
 
 # Set the version
-#sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" jami.spec
 sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" *.spec
+if [ ${DISTRIBUTION} == "fedora_32" ]; then
+    # Remove Obsoletes for Fedora 32, as we don't publish "ring"
+    sed -i '/^Obsoletes:/d' *.spec
+    sed -i '/^Provides:/d' *.spec
+    sed -i '/^Conflicts:/d' *.spec
+    # gnome-icon-theme-symbolic is removed from Fedora, but icons are well integrated
+    sed -i '/gnome-icon-theme-symbolic/d' *.spec
+fi
 
 rpmdev-bumpspec --comment="Automatic nightly release" --userstring="Jenkins <ring@lists.savoirfairelinux.net>" jami.spec
 rpmdev-bumpspec --comment="Automatic nightly release" --userstring="Jenkins <ring@lists.savoirfairelinux.net>" jami-one-click.spec

scripts/make-packaging-target.py

@@ -460,6 +460,18 @@ def run_generate_all(parsed_args):
             "output_file": ".packages-built",
             "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
         },
+        {
+            "distribution": "fedora_32",
+            "debian_packaging_override": "",
+            "output_file": ".packages-built",
+            "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
+        },
+        {
+            "distribution": "fedora_32_i386",
+            "debian_packaging_override": "",
+            "output_file": ".packages-built",
+            "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
+        },
         {
             "distribution": "rhel_8",
             "debian_packaging_override": "",