From 47c61dffa824f918a3416caa7fee12d78cf350dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 30 Apr 2021 17:29:59 -0400
Subject: [PATCH] misc: final cleanup for opensuse and debian
Change-Id: I07cf920ed99f460bffe1d8a16f3444706f4572c3
---
docker/Dockerfile_opensuse-leap_15.2 | 4 ++++
docker/Dockerfile_opensuse-tumbleweed | 4 ++++
packaging/rules/debian/control | 3 ++-
packaging/rules/debian/rules | 2 ++
packaging/rules/rpm/jami-gnome.spec | 4 ++++
5 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/docker/Dockerfile_opensuse-leap_15.2 b/docker/Dockerfile_opensuse-leap_15.2
index 4b6faa07..b962477f 100644
--- a/docker/Dockerfile_opensuse-leap_15.2
+++ b/docker/Dockerfile_opensuse-leap_15.2
@@ -90,6 +90,10 @@ RUN zypper --non-interactive up -y && \
xz \
xkeyboard-config \
libnotify \
+ libQt5Sql-devel \
+ libQt5Gui-devel \
+ libqt5-qtbase-devel \
+ libqt5-qttools \
wget
RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50
diff --git a/docker/Dockerfile_opensuse-tumbleweed b/docker/Dockerfile_opensuse-tumbleweed
index 2f0dc201..46dd137d 100644
--- a/docker/Dockerfile_opensuse-tumbleweed
+++ b/docker/Dockerfile_opensuse-tumbleweed
@@ -94,6 +94,10 @@ RUN zypper --non-interactive up -y && \
xcb-util-renderutil-devel \
xcb-util-wm-devel \
xorg-x11-devel \
+ libQt5Sql-devel \
+ libQt5Gui-devel \
+ libqt5-qtbase-devel \
+ libqt5-qttools \
xz \
libnotify \
xkeyboard-config \
diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control
index 0ab11d58..077ad4f2 100644
--- a/packaging/rules/debian/control
+++ b/packaging/rules/debian/control
@@ -120,7 +120,8 @@ Package: jami-libclient
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- jami-daemon (=${binary:Version})
+ jami-daemon (=${binary:Version}),
+ libqt-jami
Description: Secure and distributed voice, video and chat platform - daemon
Jami (jami.net) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy
diff --git a/packaging/rules/debian/rules b/packaging/rules/debian/rules
index c806cd61..23f86727 100755
--- a/packaging/rules/debian/rules
+++ b/packaging/rules/debian/rules
@@ -99,6 +99,7 @@ override_dh_auto_configure:
cmake \
-DRING_BUILD_DIR=$(CURDIR)/daemon/src \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
$(CMAKE_OPTIONS) \
..
@@ -110,6 +111,7 @@ override_dh_auto_configure:
cd build && \
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
-DLibRingClient_PROJECT_DIR=/$(CURDIR)/lrc \
-DGSETTINGS_LOCALCOMPILE=OFF \
$(CMAKE_OPTIONS) \
diff --git a/packaging/rules/rpm/jami-gnome.spec b/packaging/rules/rpm/jami-gnome.spec
index d9e8b122..170bdd55 100644
--- a/packaging/rules/rpm/jami-gnome.spec
+++ b/packaging/rules/rpm/jami-gnome.spec
@@ -31,6 +31,10 @@ BuildRequires: webkitgtk4-devel
BuildRequires: libdbus-c++-devel
BuildRequires: libappindicator-devel
BuildRequires: webkit2gtk3-devel
+BuildRequires: libQt5Sql-devel
+BuildRequires: libQt5Gui-devel
+BuildRequires: libqt5-qtbase-devel
+BuildRequires: libqt5-qttools
%endif
BuildRequires: clutter-devel
BuildRequires: clutter-gtk-devel
--
GitLab