TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM: update pclinuxos scripts

Browse Source 
Signed-off-by: François Andriot <albator78@libertysurf.fr>
pull/158/head
François Andriot 3 years ago
parent cf39f24db4
commit 26594b1e4b
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
redhat/applications/koffice/koffice.spec
Unescape View File

@ -216,7 +216,7 @@ BuildRequires: trinity-poppler-devel >= 0.12
# POSTGRESQL support # POSTGRESQL support
# Requires 'libpqxx', for kexi-driver-pgqsl # Requires 'libpqxx', for kexi-driver-pgqsl
%if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} %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 %define with_postgresql 1
BuildRequires: postgresql-devel BuildRequires: postgresql-devel
BuildRequires: libpqxx-devel BuildRequires: libpqxx-devel

8
redhat/docker/pclinuxos.pkg
Unescape View File

@ -28,7 +28,7 @@ gnutls
grep grep
gzip gzip
icu icu
icu65-data icu69-data
info-install info-install
kernel-userspace-headers kernel-userspace-headers
krb5 krb5
@ -52,10 +52,12 @@ lib64curl4
lib64db4.8 lib64db4.8
lib64dbnss4.8 lib64dbnss4.8
lib64elfutils1 lib64elfutils1
lib64ev4
lib64expat1 lib64expat1
lib64ext2fs2 lib64ext2fs2
lib64fdisk1 lib64fdisk1
lib64ffi6 lib64ffi6
lib64ffi8
lib64fuse2 lib64fuse2
lib64fuse3_3 lib64fuse3_3
lib64gcrypt20 lib64gcrypt20
@ -68,7 +70,7 @@ lib64gmp10
lib64gnutls30 lib64gnutls30
lib64gpg-error0 lib64gpg-error0
lib64gudev1.0_0 lib64gudev1.0_0
lib64icu65 lib64icu69
lib64idn2_0 lib64idn2_0
lib64intl8 lib64intl8
lib64iso9660_7 lib64iso9660_7
@ -109,6 +111,7 @@ lib64png3
lib64popt0 lib64popt0
lib64psl5 lib64psl5
lib64python3.6 lib64python3.6
lib64readline7
lib64readline8 lib64readline8
lib64rpm1 lib64rpm1
lib64rtmp1 lib64rtmp1
@ -124,6 +127,7 @@ lib64tiff3
lib64tiff5 lib64tiff5
lib64tirpc3 lib64tirpc3
lib64udev0 lib64udev0
lib64unbound8
lib64unistring2 lib64unistring2
lib64usb1.0_0 lib64usb1.0_0
lib64usb-compat0.1_4 lib64usb-compat0.1_4

7
redhat/docker/pclinuxos.sh
Unescape View File

@ -47,11 +47,12 @@ sudo chroot "${INSTALLROOT}" apt-get -y upgrade
sudo umount "${INSTALLROOT}/dev/shm" sudo umount "${INSTALLROOT}/dev/shm"
sudo umount "${INSTALLROOT}/dev" 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}" sudo rm -rf "${INSTALLROOT}"
docker rmi -f "${IMAGE}" || : docker image save "${IMAGE}" >"${IMAGE}.tar"
cat "${IMAGE}.tar" | docker import - "${IMAGE}"
rm -f "${IMAGE}.tar.gz" rm -f "${IMAGE}.tar.gz"
pigz -9 "${IMAGE}.tar" pigz -9 "${IMAGE}.tar"
mv -vf "${IMAGE}.tar.gz" "${HOME}/tde/obs" mv -vf "${IMAGE}.tar.gz" "${HOME}/tde/obs"

3
redhat/docker/pclinuxos/packages.x86_64
Unescape View File

@ -60,6 +60,8 @@ lib64geoip-devel
lib64gif-devel lib64gif-devel
lib64gpod4 lib64gpod4
lib64gpod-devel lib64gpod-devel
lib64gstreamer1.0-devel
lib64gstreamer-plugins-base1.0-devel
lib64idn-devel lib64idn-devel
lib64inotifytools-devel lib64inotifytools-devel
lib64iw29-devel lib64iw29-devel
@ -72,6 +74,7 @@ lib64poppler-devel
lib64readline-devel lib64readline-devel
lib64sane1-devel lib64sane1-devel
lib64sndfile-devel lib64sndfile-devel
lib64unwind-devel
lib64usb1.0-devel lib64usb1.0-devel
lib64usb-compat0.1-devel lib64usb-compat0.1-devel
lib64wv2-devel lib64wv2-devel

1
redhat/docker/pclinuxos/rpmmacros
Unescape View File

@ -2,3 +2,4 @@
%_smp_mflags -j8 %_smp_mflags -j8
%jobs 8 %jobs 8
%pclinuxos 2021 %pclinuxos 2021
%configure %configure2_5x

Write Preview
Loading…
Cancel
Save