summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--redhat/applications/koffice/koffice.spec2
-rw-r--r--redhat/docker/pclinuxos.pkg8
-rwxr-xr-xredhat/docker/pclinuxos.sh7
-rw-r--r--redhat/docker/pclinuxos/packages.x86_643
-rw-r--r--redhat/docker/pclinuxos/rpmmacros1
5 files changed, 15 insertions, 6 deletions
diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec
index bb7c7df7f..316653957 100644
--- a/redhat/applications/koffice/koffice.spec
+++ b/redhat/applications/koffice/koffice.spec
@@ -216,7 +216,7 @@ BuildRequires: trinity-poppler-devel >= 0.12
# POSTGRESQL support
# Requires 'libpqxx', for kexi-driver-pgqsl
%if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
-%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550
+%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550 && 0%{?pclinuxos} == 0
%define with_postgresql 1
BuildRequires: postgresql-devel
BuildRequires: libpqxx-devel
diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg
index 1b72a6d01..30bb665db 100644
--- a/redhat/docker/pclinuxos.pkg
+++ b/redhat/docker/pclinuxos.pkg
@@ -28,7 +28,7 @@ gnutls
grep
gzip
icu
-icu65-data
+icu69-data
info-install
kernel-userspace-headers
krb5
@@ -52,10 +52,12 @@ lib64curl4
lib64db4.8
lib64dbnss4.8
lib64elfutils1
+lib64ev4
lib64expat1
lib64ext2fs2
lib64fdisk1
lib64ffi6
+lib64ffi8
lib64fuse2
lib64fuse3_3
lib64gcrypt20
@@ -68,7 +70,7 @@ lib64gmp10
lib64gnutls30
lib64gpg-error0
lib64gudev1.0_0
-lib64icu65
+lib64icu69
lib64idn2_0
lib64intl8
lib64iso9660_7
@@ -109,6 +111,7 @@ lib64png3
lib64popt0
lib64psl5
lib64python3.6
+lib64readline7
lib64readline8
lib64rpm1
lib64rtmp1
@@ -124,6 +127,7 @@ lib64tiff3
lib64tiff5
lib64tirpc3
lib64udev0
+lib64unbound8
lib64unistring2
lib64usb1.0_0
lib64usb-compat0.1_4
diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh
index aa906f26c..cd7689569 100755
--- a/redhat/docker/pclinuxos.sh
+++ b/redhat/docker/pclinuxos.sh
@@ -47,11 +47,12 @@ sudo chroot "${INSTALLROOT}" apt-get -y upgrade
sudo umount "${INSTALLROOT}/dev/shm"
sudo umount "${INSTALLROOT}/dev"
-sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar"
+docker rmi -f "${IMAGE}" || :
+sudo tar -C "${INSTALLROOT}" -c . | docker import - "${IMAGE}"
+docker run -ti --rm "${IMAGE}" ls -l
sudo rm -rf "${INSTALLROOT}"
-docker rmi -f "${IMAGE}" || :
-cat "${IMAGE}.tar" | docker import - "${IMAGE}"
+docker image save "${IMAGE}" >"${IMAGE}.tar"
rm -f "${IMAGE}.tar.gz"
pigz -9 "${IMAGE}.tar"
mv -vf "${IMAGE}.tar.gz" "${HOME}/tde/obs"
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index 3d9b6c38b..abbbc7948 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -60,6 +60,8 @@ lib64geoip-devel
lib64gif-devel
lib64gpod4
lib64gpod-devel
+lib64gstreamer1.0-devel
+lib64gstreamer-plugins-base1.0-devel
lib64idn-devel
lib64inotifytools-devel
lib64iw29-devel
@@ -72,6 +74,7 @@ lib64poppler-devel
lib64readline-devel
lib64sane1-devel
lib64sndfile-devel
+lib64unwind-devel
lib64usb1.0-devel
lib64usb-compat0.1-devel
lib64wv2-devel
diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros
index 067e3aa64..bbb269929 100644
--- a/redhat/docker/pclinuxos/rpmmacros
+++ b/redhat/docker/pclinuxos/rpmmacros
@@ -2,3 +2,4 @@
%_smp_mflags -j8
%jobs 8
%pclinuxos 2021
+%configure %configure2_5x