diff options
| author | François Andriot <albator78@libertysurf.fr> | 2021-11-01 21:46:22 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2021-11-01 21:47:22 +0100 |
| commit | 5c224f2715d27c476e316eb812182f0deca29d19 (patch) | |
| tree | 990fb5e4ccc49b687345deae9c25868ba19fa113 | |
| parent | b3154fbdf58156daf7b42d8c84ef65d399c838a1 (diff) | |
| download | tde-packaging-5c224f27.tar.gz tde-packaging-5c224f27.zip | |
RPM: update osstw build scripts
Signed-off-by: François Andriot <albator78@libertysurf.fr>
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.i686 | 10 | ||||
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.x86_64 | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index aec6afbe2..9e217a5c6 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -24,3 +24,13 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && 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 + +# Add GeoIP +RUN rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm + +# Add lilypond (i686 only) +RUN setarch ${ARCH} sudo zypper -n install dblatex fontforge ghostscript-fonts-other mftrace "pkgconfig(guile-1.8)" potrace-devel t1utils texi2html texlive-lh texinfo \ + && rpm -ivh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.23.3-2.1.src.rpm \ + && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ + && setarch ${ARCH} rpmbuild -ba ~/rpmbuild/SPECS/lilypond.spec diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index 32ac86928..574d18973 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -24,3 +24,7 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && 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 + +# Add GeoIP +RUN rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm |