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 build scripts for pclinuxos

Browse Source 
Signed-off-by: François Andriot <albator78@libertysurf.fr>
pull/257/head
François Andriot 2 years ago
parent e066391833
commit ae2a5ca1f2
12 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
redhat/applications/office/kbibtex/kbibtex.spec
Unescape View File

@ -80,7 +80,7 @@ BuildRequires: openssl-devel
BuildRequires: libxslt-devel BuildRequires: libxslt-devel
# YAZ support # YAZ support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?suse_version} %if 0%{?fedora} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version}
BuildRequires: libyaz-devel BuildRequires: libyaz-devel
%endif %endif

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

@ -246,7 +246,9 @@ BuildRequires: wv2-devel
# MESA support # MESA support
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos} == 0
BuildRequires: %{_lib}mesagl-devel BuildRequires: %{_lib}mesagl-devel
%endif
BuildRequires: %{_lib}mesaglu1-devel BuildRequires: %{_lib}mesaglu1-devel
%endif %endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}

6
redhat/applications/office/tellico/tellico.spec
Unescape View File

@ -220,14 +220,10 @@ documentation.
%{tde_datadir}/apps/tellico/*.xml %{tde_datadir}/apps/tellico/*.xml
%{tde_datadir}/apps/tellico/*.png %{tde_datadir}/apps/tellico/*.png
%{tde_datadir}/apps/tellico/entry-templates %{tde_datadir}/apps/tellico/entry-templates
%if 0%{?rhel} == 7 || 0%{?suse_version}
%{tde_datadir}/apps/tellico/*.py* %{tde_datadir}/apps/tellico/*.py*
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7 || 0%{?mgaversion} >= 8
%{tde_datadir}/apps/tellico/__pycache__/ %{tde_datadir}/apps/tellico/__pycache__/
%endif %endif
%else
%pycached %{tde_datadir}/apps/tellico/*.py
%endif
%{tde_datadir}/apps/tellico/pics %{tde_datadir}/apps/tellico/pics
%{tde_datadir}/apps/tellico/report-templates %{tde_datadir}/apps/tellico/report-templates
%{tde_datadir}/apps/tellico/tellico.dtd %{tde_datadir}/apps/tellico/tellico.dtd

6
redhat/applications/settings/tde-guidance/tde-guidance.spec
Unescape View File

@ -191,7 +191,7 @@ or can be run as standalone applications.
%{tde_datadir}/apps/guidance/ %{tde_datadir}/apps/guidance/
%{tde_tdeappdir}/*.desktop %{tde_tdeappdir}/*.desktop
%{tde_datadir}/icons/crystalsvg/*/*/*.png %{tde_datadir}/icons/crystalsvg/*/*/*.png
%if 0%{?rhel} == 7 || 0%{?suse_version} %if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/%{name}/SMBShareSelectDialog.py* %{python_sitearch}/%{name}/SMBShareSelectDialog.py*
%{python_sitearch}/%{name}/SimpleCommandRunner.py* %{python_sitearch}/%{name}/SimpleCommandRunner.py*
%{python_sitearch}/%{name}/fuser.py* %{python_sitearch}/%{name}/fuser.py*
@ -259,7 +259,7 @@ Guidance configuration tools.
%files backends %files backends
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{python_sitearch}/%{name} %dir %{python_sitearch}/%{name}
%if 0%{?rhel} == 7 || 0%{?suse_version} %if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/%{name}/MicroHAL.py* %{python_sitearch}/%{name}/MicroHAL.py*
%{python_sitearch}/%{name}/drivedetect.py* %{python_sitearch}/%{name}/drivedetect.py*
%{python_sitearch}/%{name}/wineread.py* %{python_sitearch}/%{name}/wineread.py*
@ -307,7 +307,7 @@ suspend using HAL.
%files powermanager %files powermanager
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/guidance-power-manager %{tde_bindir}/guidance-power-manager
%if 0%{?rhel} == 7 || 0%{?suse_version} %if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/%{name}/MicroHAL.py* %{python_sitearch}/%{name}/MicroHAL.py*
%{python_sitearch}/%{name}/guidance-power-manager.py* %{python_sitearch}/%{name}/guidance-power-manager.py*
%{python_sitearch}/%{name}/powermanage.py* %{python_sitearch}/%{name}/powermanage.py*

2
redhat/core/tdebindings/tdebindings.spec
Unescape View File

@ -686,7 +686,7 @@ This package is part of the official TDE bindings module.
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{python_sitearch}/pcop.la %{python_sitearch}/pcop.la
%{python_sitearch}/pcop.so %{python_sitearch}/pcop.so
%if 0%{?rhel} == 7 || 0%{?suse_version} %if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/pydcop.py* %{python_sitearch}/pydcop.py*
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
%{python_sitearch}/__pycache__/pydcop.*.pyc %{python_sitearch}/__pycache__/pydcop.*.pyc

4
redhat/dependencies/pytqt/pytqt.spec
Unescape View File

@ -140,7 +140,7 @@ same way in both languages (with syntax differences, of course)
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc NEWS README %doc NEWS README
%dir %{python_sitearch}/PyTQt %dir %{python_sitearch}/PyTQt
%if 0%{?rhel} == 7 || 0%{?suse_version} %if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/PyTQt/__init__.py* %{python_sitearch}/PyTQt/__init__.py*
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
%{python_sitearch}/PyTQt/__pycache__/__init__.*.pyc %{python_sitearch}/PyTQt/__pycache__/__init__.*.pyc
@ -230,7 +230,7 @@ packages based on them, like PyTDE.
%files -n pytqt-devel %files -n pytqt-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%if 0%{?rhel} == 7 || 0%{?suse_version} %if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/PyTQt/pytqtconfig.py* %{python_sitearch}/PyTQt/pytqtconfig.py*
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
%{python_sitearch}/PyTQt/__pycache__/pytqtconfig.*.pyc %{python_sitearch}/PyTQt/__pycache__/pytqtconfig.*.pyc

2
redhat/dependencies/sip4-tqt/sip4-tqt.spec
Unescape View File

@ -111,7 +111,7 @@ specificity towards C++ and Python.
%files -n sip4-tqt %files -n sip4-tqt
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{python_sitearch}/sip_tqt.so %{python_sitearch}/sip_tqt.so
%if 0%{?rhel} == 7 || 0%{?suse_version} %if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/sip_tqt_config.py* %{python_sitearch}/sip_tqt_config.py*
%{python_sitearch}/sip_tqt_distutils.py* %{python_sitearch}/sip_tqt_distutils.py*
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7

19
redhat/docker/pclinuxos.pkg
Unescape View File

@ -22,13 +22,13 @@ gawk
gcrypt gcrypt
gdk-pixbuf2.0 gdk-pixbuf2.0
glibc glibc
glibc-devel
gnupg gnupg
gnutls gnutls
grep grep
gzip gzip
icu icu
icu69-data icu69-data
icu71-data
info-install info-install
kernel-userspace-headers kernel-userspace-headers
krb5 krb5
@ -39,7 +39,6 @@ lib64apt-pkg0
lib64assuan0 lib64assuan0
lib64attr1 lib64attr1
lib64audit1 lib64audit1
lib64audit-devel
lib64blkid1 lib64blkid1
lib64brotlicommon1 lib64brotlicommon1
lib64brotlidec1 lib64brotlidec1
@ -69,8 +68,12 @@ lib64glib2.0_0
lib64gmp10 lib64gmp10
lib64gnutls30 lib64gnutls30
lib64gpg-error0 lib64gpg-error0
libgpg-error-common
lib64gsasl
lib64gudev1.0_0 lib64gudev1.0_0
lib64icu69 lib64icu69
lib64icu71
lib64idn11
lib64idn2_0 lib64idn2_0
lib64intl8 lib64intl8
lib64iso9660_7 lib64iso9660_7
@ -86,6 +89,7 @@ lib64cap-ng0
lib64lua5.1 lib64lua5.1
lib64lzma5 lib64lzma5
lib64magic1 lib64magic1
lib64mnl0
lib64mount1 lib64mount1
lib64mpfr6 lib64mpfr6
lib64ncurses5 lib64ncurses5
@ -97,11 +101,11 @@ lib64notify4
lib64npth0 lib64npth0
lib64nspr4 lib64nspr4
lib64nss3 lib64nss3
lib64ntlm
lib64openssl1.0.0 lib64openssl1.0.0
lib64openssl1.1.0 lib64openssl1.1.0
lib64opts25 lib64opts25
lib64pam0 lib64pam0
lib64pam-devel
lib64pam_userpass1 lib64pam_userpass1
lib64pcre1 lib64pcre1
lib64pcre2_0 lib64pcre2_0
@ -110,13 +114,15 @@ lib64png16_16
lib64png3 lib64png3
lib64popt0 lib64popt0
lib64psl5 lib64psl5
lib64python3.6 lib64python3.10
lib64readline7 lib64readline7
lib64readline8 lib64readline8
lib64rpm1 lib64rpm1
lib64rtmp1 lib64rtmp1
lib64sasl2 lib64sasl2
lib64secret1_0 lib64secret1_0
lib64selinux
lib64sharpyuv0
lib64sigsegv2 lib64sigsegv2
lib64smartcols1 lib64smartcols1
lib64sqlite3_0 lib64sqlite3_0
@ -127,6 +133,7 @@ lib64tiff3
lib64tiff5 lib64tiff5
lib64tirpc3 lib64tirpc3
lib64udev0 lib64udev0
lib64udev
lib64unbound8 lib64unbound8
lib64unistring2 lib64unistring2
lib64usb1.0_0 lib64usb1.0_0
@ -137,7 +144,6 @@ lib64webp7
lib64x11_6 lib64x11_6
lib64xau6 lib64xau6
lib64xcrypt1 lib64xcrypt1
lib64xcrypt-devel
lib64xdmcp6 lib64xdmcp6
lib64xml2_2 lib64xml2_2
lib64zstd1 lib64zstd1
@ -147,6 +153,7 @@ libnotify
libstdc++6 libstdc++6
libtirpc libtirpc
libxcb libxcb
lsb-release
makedev makedev
mktemp mktemp
multiarch-utils multiarch-utils
@ -158,6 +165,7 @@ openssl
p11-kit p11-kit
pam pam
pam_tcb pam_tcb
patch
perl perl
perl-base perl-base
perl-File-Sync perl-File-Sync
@ -169,6 +177,7 @@ popt-data
procps procps
publicsuffix-list-dafsa publicsuffix-list-dafsa
python3 python3
python3-rpm-macros
rmt rmt
rootcerts rootcerts
rpm rpm

15
redhat/docker/pclinuxos.sh
Unescape View File

@ -1,7 +1,7 @@
#!/bin/bash -ex #!/bin/bash -ex
NAME="pclinuxos" NAME="pclinuxos"
VERSION="${1:-2021}" # E.g: '2020' VERSION="${1:-2023}" # E.g: '2020'
IMAGE="${NAME}:${VERSION}" IMAGE="${NAME}:${VERSION}"
INSTALLROOT="/dev/shm/${IMAGE}" INSTALLROOT="/dev/shm/${IMAGE}"
@ -29,19 +29,17 @@ sudo mount --bind "/dev" "${INSTALLROOT}/dev"
sudo mkdir -p "${INSTALLROOT}/var/lib/rpm" sudo mkdir -p "${INSTALLROOT}/var/lib/rpm"
sudo rpmdb --initdb --root="${INSTALLROOT}" sudo rpmdb --initdb --root="${INSTALLROOT}"
sudo rpm -Uvh --noscripts --root="${INSTALLROOT}" "/dev/shm/packages/"*".rpm" sudo rpm -Uvh --noscripts --nodeps --root="${INSTALLROOT}" "/dev/shm/packages/"*".rpm"
# Fix lzma library location
sudo mv "${INSTALLROOT}/lib/liblzma."* "${INSTALLROOT}/lib64"
# Réinstall distro from inside chroot # Réinstall distro from inside chroot
sudo mount --bind "/dev/shm" "${INSTALLROOT}/dev/shm" sudo mount --bind "/dev/shm" "${INSTALLROOT}/dev/shm"
sudo rm -rf "${INSTALLROOT}/var/lib/rpm" sudo rm -rf "${INSTALLROOT}/var/lib/rpm"
sudo chroot "${INSTALLROOT}" rpmdb --initdb sudo chroot "${INSTALLROOT}" rpmdb --initdb
sudo chroot "${INSTALLROOT}" rpm -Uvh "/dev/shm/packages/"*".rpm" sudo chroot "${INSTALLROOT}" rpm -Uvh --nodeps "/dev/shm/packages/"*".rpm"
sudo cp "/etc/resolv.conf" "${INSTALLROOT}/etc/resolv.conf" sudo cp "/etc/resolv.conf" "${INSTALLROOT}/etc/resolv.conf"
sudo chroot "${INSTALLROOT}" apt-get -y update sudo chroot "${INSTALLROOT}" apt-get -y update
sudo chroot "${INSTALLROOT}" apt-get -y --fix-broken install
sudo chroot "${INSTALLROOT}" apt-get -y upgrade sudo chroot "${INSTALLROOT}" apt-get -y upgrade
sudo umount "${INSTALLROOT}/dev/shm" sudo umount "${INSTALLROOT}/dev/shm"
@ -52,7 +50,4 @@ sudo tar -C "${INSTALLROOT}" -c . | docker import - "${IMAGE}"
docker run -ti --rm "${IMAGE}" ls -l docker run -ti --rm "${IMAGE}" ls -l
sudo rm -rf "${INSTALLROOT}" sudo rm -rf "${INSTALLROOT}"
docker image save "${IMAGE}" >"${IMAGE}.tar" docker image save "${IMAGE}" | pigz -9 >"${HOME}/tde/docker/${IMAGE}.tar.gz"
rm -f "${IMAGE}.tar.gz"
pigz -9 "${IMAGE}.tar"
mv -vf "${IMAGE}.tar.gz" "${HOME}/tde/obs"

11
redhat/docker/pclinuxos/Dockerfile.x86_64
Unescape View File

@ -1,4 +1,4 @@
FROM pclinuxos:2021 FROM pclinuxos:2023
ARG TDE_VERSION=14.1.0 ARG TDE_VERSION=14.1.0
ARG ARCH=x86_64 ARG ARCH=x86_64
@ -6,8 +6,8 @@ ARG ARCH=x86_64
# Update distribution # Update distribution
# Install Trinity build dependencies # Install Trinity build dependencies
COPY packages.${ARCH} /packages COPY packages.${ARCH} /packages
RUN apt-get -y update \ RUN set -x \
&& apt-get -y install glibc \ && apt-get -y update \
&& apt-get -y dist-upgrade \ && apt-get -y dist-upgrade \
&& apt-get -y install $(</packages) && apt-get -y install $(</packages)
@ -56,3 +56,8 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/html2ps-2.0-3.b7.8.mga8.src.rpm \ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/html2ps-2.0-3.b7.8.mga8.src.rpm \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/html2ps.spec \ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/html2ps.spec \
&& sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/html2ps-2*.rpm && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/html2ps-2*.rpm
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/updates/heimdal-7.7.1-1.3.mga8.src.rpm \
&& sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%autopatch|%patch1|" -e "/Conflicts: krb5-devel/ s|^|#|" \
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \
&& sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm

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

@ -65,6 +65,7 @@ lib64gstreamer-plugins-base1.0-devel
lib64idn-devel lib64idn-devel
lib64inotifytools-devel lib64inotifytools-devel
lib64iw29-devel lib64iw29-devel
lib64jack-devel
lib64nm-devel lib64nm-devel
lib64mpcdec-devel lib64mpcdec-devel
lib64OpenSP5-devel lib64OpenSP5-devel
@ -158,6 +159,7 @@ net-snmp-devel
ocaml ocaml
OpenEXR-devel OpenEXR-devel
openldap-devel openldap-devel
openldap-servers
opensc opensc
openslp-devel openslp-devel
pam-devel pam-devel
@ -168,17 +170,17 @@ perl-PAR-Packer
perl-pcsc-perl perl-pcsc-perl
pilot-link-devel pilot-link-devel
pkgconfig(pygtk-2.0) pkgconfig(pygtk-2.0)
popt-devel
postgresql postgresql
postgresql-devel postgresql-devel
ppp ppp
pth-devel pth-devel
python3 python3
python-devel python3-devel
python-rpm python-rpm
qt4-devel qt4-devel
recode recode
rpm-build rpm-build
rpm-devel
ruby-devel ruby-devel
scons scons
SDL-devel SDL-devel

2
redhat/libraries/pytde/pytde.spec
Unescape View File

@ -91,7 +91,7 @@ from tdeio, tdejs, tdehtml and tdeprint.
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README %doc AUTHORS ChangeLog COPYING NEWS README
%{python_sitearch}/*.so %{python_sitearch}/*.so
%if 0%{?rhel} == 7 || 0%{?suse_version} %if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/dcopexport.py* %{python_sitearch}/dcopexport.py*
%{python_sitearch}/dcopext.py* %{python_sitearch}/dcopext.py*
%{python_sitearch}/pytdeconfig.py* %{python_sitearch}/pytdeconfig.py*

Write Preview
Loading…
Cancel
Save