diff options
| author | François Andriot <albator78@libertysurf.fr> | 2025-05-01 09:59:59 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2025-05-01 09:59:59 +0200 |
| commit | 19d08f5bf8b704bcf317ab2970ce997c179e0ed2 (patch) | |
| tree | e18ebdf17c8d7e95ceee0a6a6183ef61a7e30220 /redhat/docker/osstw | |
| parent | 187788a4af89b20879a0e0b1d2127c67f2312f76 (diff) | |
| download | tde-packaging-19d08f5b.tar.gz tde-packaging-19d08f5b.zip | |
RPM: update for building 14.1.4
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/docker/osstw')
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.i686 | 7 | ||||
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.x86_64 | 5 | ||||
| -rw-r--r-- | redhat/docker/osstw/packages | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index fef8b3092..61bf0f4d9 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM opensuse32/tumbleweed:latest -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=i686 # Add PACKMAN repository @@ -28,9 +28,12 @@ RUN set -x \ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch +RUN set -x \ + && sudo rpm -Uvh --nodeps https://download.opensuse.org/repositories/network/openSUSE_Tumbleweed/i586/torsocks-2.4.0-15.25.i586.rpm + # Add lilypond (i686 only) RUN set -x \ - && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.5.src.rpm \ + && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.6.src.rpm \ && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \ && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm" diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index 6efe437d5..4498a9573 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/tumbleweed:latest -ARG TDE_VERSION=14.1.3 +ARG TDE_VERSION=14.1.4 ARG ARCH=x86_64 # Add PACKMAN repository @@ -27,3 +27,6 @@ RUN set -x \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch + +RUN set -x \ + && sudo rpm -Uvh --nodeps https://download.opensuse.org/repositories/network/openSUSE_Tumbleweed/x86_64/torsocks-2.4.0-15.25.x86_64.rpm diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index 6a28ed98d..b18437051 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -179,14 +179,13 @@ openssl pam-devel patch pciutils-devel -pcre-devel +pcre2-devel pcsc-lite-devel perl-JSON perl-PAR-Packer perl-pcsc pkcs11-helper-devel pkgconfig(bdw-gc) -pkgconfig(guile-1.8) pkgconfig(guile-3.0) polkit-devel postgresql |