diff options
| author | François Andriot <albator78@libertysurf.fr> | 2024-06-13 08:37:13 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2024-06-13 08:38:31 +0200 |
| commit | ac47c91c6c011631186592695e4251a3bb97dcca (patch) | |
| tree | d91e4e98d96b4b2618d9fb3b879c28b67fc63a8f /redhat/docker/f37 | |
| parent | 1488354ed514d043f0c15ddbe8b9aa7c0b43f46c (diff) | |
| download | tde-packaging-ac47c91c.tar.gz tde-packaging-ac47c91c.zip | |
RPM: synchronize redhat directory with r14.1.x branch
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/docker/f37')
| -rw-r--r-- | redhat/docker/f37/Dockerfile.x86_64 | 6 | ||||
| -rw-r--r-- | redhat/docker/f37/packages | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/redhat/docker/f37/Dockerfile.x86_64 b/redhat/docker/f37/Dockerfile.x86_64 index 0390ea2f7..fc288134d 100644 --- a/redhat/docker/f37/Dockerfile.x86_64 +++ b/redhat/docker/f37/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:37 -ARG TDE_VERSION=14.1.0 +ARG TDE_VERSION=14.1.2 ARG ARCH=x86_64 # Fix DNF database corruption @@ -31,13 +31,11 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \ USER trinity COPY rpmmacros /home/trinity/.rpmmacros -RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm - RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* -RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \ +RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2* diff --git a/redhat/docker/f37/packages b/redhat/docker/f37/packages index cca3f9bb1..6fd5a4f15 100644 --- a/redhat/docker/f37/packages +++ b/redhat/docker/f37/packages @@ -117,6 +117,7 @@ libofx-devel libogg-devel libotr-devel libpaper-devel +libpqxx-devel libqalculate-devel libraw1394-devel librsvg2 @@ -194,7 +195,6 @@ pkgconfig(pygtk-2.0) polkit-devel poppler-devel postgresql -postgresql-devel postgresql-private-devel postgresql-server-devel ppp |