diff options
| author | François Andriot <[email protected]> | 2024-10-07 21:17:55 +0200 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2024-10-07 21:17:55 +0200 |
| commit | 4c78786737534ba658e3b33230b364850e31fbb5 (patch) | |
| tree | 80807b0ca0d51fd286ab5939dcdefb65dc558e5a /redhat/docker/el7 | |
| parent | e81c987a3b55cab388b89f647b807414648ad6b8 (diff) | |
| download | tde-packaging-4c78786737534ba658e3b33230b364850e31fbb5.tar.gz tde-packaging-4c78786737534ba658e3b33230b364850e31fbb5.zip | |
RPM: many updates for upcoming R14.1.3
Signed-off-by: François Andriot <[email protected]>
Diffstat (limited to 'redhat/docker/el7')
| -rw-r--r-- | redhat/docker/el7/Dockerfile.x86_64 | 20 | ||||
| -rw-r--r-- | redhat/docker/el7/packages | 2 |
2 files changed, 19 insertions, 3 deletions
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index 1366cfb18..12ce82bca 100644 --- a/redhat/docker/el7/Dockerfile.x86_64 +++ b/redhat/docker/el7/Dockerfile.x86_64 @@ -8,11 +8,14 @@ ARG ARCH=x86_64 # Add RPMFUSION repository # Install Trinity build dependencies COPY packages /packages -RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ - && yum -y install epel-release \ - && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm \ +RUN set -x \ + && cd /etc/yum.repos.d \ + && rm -fv *.repo \ + && curl http://repo/repo/{centos7,epel7,rpmfusion7}.repo >repos.repo \ + && sed -i "repos.repo" -e "s|https://|http://|" \ && yum -y clean all \ && yum -y update \ + && rm -fv {CentOS,epel}-*.repo \ && yum -y install $(</packages) # Add YUM repository for locally built packages @@ -48,3 +51,14 @@ RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/lin RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm + +#RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/10/Everything/source/tree/Packages/l/libunibreak-6.1-2.el10_0.src.rpm \ +# && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/^Patch:.*offline_files.patch/ s/^Patch:/Patch1:/" -e "/^Patch:.*remove_unused_var.patch/ s/^Patch:/Patch2:/" \ +# && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/%forgeautosetup/ s|.*|%autosetup -p1 -n libunibreak-libunibreak_6_1|" -e "s|%forgesource|libunibreak-libunibreak_6_1.tar.gz|" \ +# && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec --define "forgemeta %nil" \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm + +RUN set -x \ + && rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/39/Everything/source/tree/Packages/l/libunibreak-4.0-13.fc39.src.rpm --define "ldconfig_scriptlets %post -p /sbin/ldconfig" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{4,devel}*.rpm + diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index a39c59cdd..67be667a7 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -133,6 +133,7 @@ libutempter-devel libv4l-devel libvisual-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libXaw-devel @@ -167,6 +168,7 @@ opensp-devel pam-devel pciutils-devel pcre-devel +pcre2-devel pcsc-lite-devel pcsc-perl perl |