diff options
| author | François Andriot <albator78@libertysurf.fr> | 2022-11-08 11:30:23 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2022-11-08 11:30:23 +0100 |
| commit | 238a465766026d4a903f327d8eebabd7d56281d8 (patch) | |
| tree | 6fab64f784bdd02c190cd164f22ef7fe2f42d783 | |
| parent | a6ebd51a1a94620586a032f3191380e971a83e20 (diff) | |
| download | tde-packaging-238a465766026d4a903f327d8eebabd7d56281d8.tar.gz tde-packaging-238a465766026d4a903f327d8eebabd7d56281d8.zip | |
RPM: fixes for TDE r14.0.13
| -rw-r--r-- | redhat/applications/tderadio/tderadio.spec | 4 | ||||
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.x86_64 | 4 | ||||
| -rw-r--r-- | redhat/docker/sshfs | 19 |
3 files changed, 3 insertions, 24 deletions
diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/tderadio/tderadio.spec index 121784cc3..048f24c87 100644 --- a/redhat/applications/tderadio/tderadio.spec +++ b/redhat/applications/tderadio/tderadio.spec @@ -197,6 +197,9 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -f %{?buildroot}%{tde_libdir}/libtderadio.la %__rm -f %{?buildroot}%{tde_libdir}/libtderadio.so +# Remove pixmas +%__rm -fr %{?buildroot}%{tde_datadir}/pixmaps/ + %clean %__rm -rf %{buildroot} @@ -218,7 +221,6 @@ export PATH="%{tde_bindir}:${PATH}" %dir %{tde_datadir}/icons/hicolor/256x256/actions %{tde_datadir}/icons/hicolor/*/*/tderadio*.png %{tde_datadir}/icons/locolor/*/*/tderadio*.png -%{tde_datadir}/pixmaps/tderadio.xpm %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo %lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo %lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index 6a870a171..21fc9a863 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -28,7 +28,3 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ # 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 Jasper -RUN sudo rpm -e libjasper-devel libjasper6 \ - && sudo rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/distribution/leap/15.3/repo/oss/x86_64/{jasper,libjasper-devel,libjasper4}-2.0.14-3.19.1.x86_64.rpm diff --git a/redhat/docker/sshfs b/redhat/docker/sshfs deleted file mode 100644 index d915be882..000000000 --- a/redhat/docker/sshfs +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -ex - -sudo urpmi --auto openssh-clients sshfs-fuse - -DIST="$(rpm -E %dist)" -TDE_VERSION="14.0.13" - -# Autofs: -sudo /usr/sbin/automount - -# NFS: -sudo mount -t nfs xh61v:/exports/tde tde -sudo mount -t nfs xh61v:/exports/rpmbuild/RPMS rpmbuild/RPMS -sudo mount -t nfs xh61v:/exports/rpmbuild/SRPMS rpmbuild/SRPMS - -# SSH: -sshfs francois@192.168.111.249:/exports/tde ${HOME}/tde -o nonempty,allow_root -sshfs francois@192.168.111.249:/exports/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION} -o nonempty,allow_root -sshfs francois@192.168.111.249:/exports/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION} ${HOME}/rpmbuild/SRPMS.tde-${TDE_VERSION} -o nonempty,allow_root |