diff --git a/client-android b/client-android index c1158499d97b9f24843617a44402c148e6bff08e..9edf291d7af735557dc3843f946600542f87f50b 160000 --- a/client-android +++ b/client-android @@ -1 +1 @@ -Subproject commit c1158499d97b9f24843617a44402c148e6bff08e +Subproject commit 9edf291d7af735557dc3843f946600542f87f50b diff --git a/daemon b/daemon index 381d661a7975d8d4abfc5711473ab4d77d7de371..baf125519ec6ee7c22f3c4a415d4ce528f032147 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit 381d661a7975d8d4abfc5711473ab4d77d7de371 +Subproject commit baf125519ec6ee7c22f3c4a415d4ce528f032147 diff --git a/packaging/rules/rhel/jami-one-click.spec b/packaging/rules/rhel/jami-one-click.spec index e3cb6f78f704f61d6d3f6be8e8c6aa3aba45a073..5d5fadc19c9514823d344b93063557fd79f09f70 100644 --- a/packaging/rules/rhel/jami-one-click.spec +++ b/packaging/rules/rhel/jami-one-click.spec @@ -40,8 +40,7 @@ BuildRequires: libuuid-devel BuildRequires: libXfixes-devel BuildRequires: gnutls-devel BuildRequires: nettle-devel -#BuildRequires: jsoncpp-devel -#BuildRequires: json-devel +BuildRequires: jsoncpp-devel BuildRequires: gcc-c++ BuildRequires: glib2-devel BuildRequires: gtk3-devel @@ -94,7 +93,7 @@ cd %{_builddir}/ring-project/daemon/contrib/native && \ make list && \ make fetch && \ make -j4 V=1 && \ - make -j4 V=1 .ffmpeg + make -j4 V=1 .ffmpeg .gnutls cd %{_builddir}/ring-project/daemon && \ ./autogen.sh && \ diff --git a/packaging/rules/rhel/jami.spec b/packaging/rules/rhel/jami.spec index 6756073d08de6849f07c767ded8b96a4a12021f1..e755c5fc086c64e93d5c2ec244fadadc7cd90090 100644 --- a/packaging/rules/rhel/jami.spec +++ b/packaging/rules/rhel/jami.spec @@ -41,8 +41,7 @@ BuildRequires: libuuid-devel BuildRequires: libXfixes-devel BuildRequires: gnutls-devel BuildRequires: nettle-devel -#BuildRequires: jsoncpp-devel -#BuildRequires: json-devel +BuildRequires: jsoncpp-devel BuildRequires: gcc-c++ BuildRequires: glib2-devel BuildRequires: gtk3-devel @@ -113,7 +112,7 @@ cd %{_builddir}/ring-project/daemon/contrib/native && \ make list && \ make fetch && \ make -j4 V=1 && \ - make -j4 V=1 .ffmpeg + make -j4 V=1 .ffmpeg .gnutls cd %{_builddir}/ring-project/daemon && \ ./autogen.sh && \