diff --git a/docker/Dockerfile_fedora_29 b/docker/Dockerfile_fedora_29 index acac3a117d569fa53966d83bfdc8823944d4133c..cb8fcd71930d8f762e55f89d47a5eba19c8921e3 100644 --- a/docker/Dockerfile_fedora_29 +++ b/docker/Dockerfile_fedora_29 @@ -7,6 +7,7 @@ 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 qt5-qtbase-5.11.1-7.fc29 qt5-linguist-5.11.1-2.fc29 qt5-qtbase-devel-5.11.1-7.fc29 && \ dnf install -y \ git \ rpm-build \ @@ -60,6 +61,8 @@ RUN dnf upgrade -y && \ openssl-static \ sqlite-devel +RUN echo "exclude=qt5-qtbase* qt5-linguist*" >> /etc/dnf/dnf.conf + ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh CMD /opt/build-package-fedora.sh diff --git a/packaging/rules/fedora/ring.spec b/packaging/rules/fedora/ring.spec index 4b9cb4a994aa662ec702104c94356cf27468e77d..7391648aa04db6823f0430882678f1705769c010 100644 --- a/packaging/rules/fedora/ring.spec +++ b/packaging/rules/fedora/ring.spec @@ -208,7 +208,8 @@ DESTDIR=%{buildroot} make -C client-gnome/build install /sbin/ldconfig /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig #for < f24 we have to update the schema explicitly %if 0%{?fedora} < 24