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

RPM: add build scripts for Mageia 9

Browse Source 
Signed-off-by: François Andriot <albator78@libertysurf.fr>
pull/257/head
François Andriot 1 year ago
parent 6783a326d4
commit 7919e63aaf
20 changed files with 143 additions and 35 deletions
Show Stats Download Patch File Download Diff File

6
redhat/Makefile
Unescape View File

@ -144,12 +144,12 @@ ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .osstw ))
endif
esound:
ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw ))
ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .mga9 .oss151 .oss152 .oss153 .oss154 .osstw ))
$(call buildpkg,3rdparty/esound)
endif
htdig:
ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .mga6 .mga7 .mga8 ))
ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .mga6 .mga7 .mga8 .mga9 ))
$(call buildpkg,extras/htdig)
endif
@ -159,7 +159,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw ))
endif
lcms:
ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw ))
ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .mga9 .oss151 .oss152 .oss153 .oss154 .osstw ))
$(call buildpkg,3rdparty/lcms)
endif

10
redhat/applications/misc/kcmldap/kcmldap.spec
Unescape View File

@ -102,7 +102,15 @@ BuildRequires: openldap24-libs-devel
%endif
# KRB5 support
BuildRequires: krb5-devel
#BuildRequires: krb5-devel
# HEIMDAL support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: heimdal-devel
%endif
%if 0%{?suse_version}
BuildRequires: libheimdal-devel
%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6

10
redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
Unescape View File

@ -92,7 +92,15 @@ BuildRequires: openldap24-libs-devel
%endif
# KRB5 support
BuildRequires: krb5-devel
#BuildRequires: krb5-devel
# HEIMDAL support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: heimdal-devel
%endif
%if 0%{?suse_version}
BuildRequires: libheimdal-devel
%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6

10
redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
Unescape View File

@ -89,7 +89,15 @@ BuildRequires: openldap24-libs-devel
%endif
# KRB5 support
BuildRequires: krb5-devel
#BuildRequires: krb5-devel
# HEIMDAL support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: heimdal-devel
%endif
%if 0%{?suse_version}
BuildRequires: libheimdal-devel
%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6

10
redhat/applications/misc/kerberostray/kerberostray.spec
Unescape View File

@ -89,7 +89,15 @@ BuildRequires: openldap24-libs-devel
%endif
# KRB5 support
BuildRequires: krb5-devel
#BuildRequires: krb5-devel
# HEIMDAL support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: heimdal-devel
%endif
%if 0%{?suse_version}
BuildRequires: libheimdal-devel
%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6

4
redhat/applications/multimedia/amarok/amarok.spec
Unescape View File

@ -195,9 +195,13 @@ BuildRequires: libvisual-devel
%if 0%{?fedora} >= 24
BuildRequires: libmusicbrainz5-devel
%else
%if 0%{?mgaversion} >= 9
BuildRequires: %{_lib}musicbrainz5-devel
%else
BuildRequires: libmusicbrainz-devel
%endif
%endif
%endif
# TUNEPIMP support
%if 0%{?pclinuxos}

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

@ -221,7 +221,7 @@ documentation.
%{tde_datadir}/apps/tellico/*.png
%{tde_datadir}/apps/tellico/entry-templates
%{tde_datadir}/apps/tellico/*.py*
%if 0%{?rhel} == 7 || 0%{?mgaversion} >= 8
%if 0%{?rhel} == 7 || 0%{?mgaversion} == 8
%{tde_datadir}/apps/tellico/__pycache__/
%endif
%{tde_datadir}/apps/tellico/pics

2
redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
Unescape View File

@ -98,7 +98,7 @@ Requires: NetworkManager-gnome
Requires: networkmanager
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} != 8
%if 0%{?mgaversion} && 0%{?mgaversion} <= 7
BuildRequires: %{_lib}nm-util-devel
%endif
%endif

3
redhat/build/update_repository.sh
Unescape View File

@ -20,7 +20,8 @@ if [ -x /usr/sbin/urpmi ]; then
elif [ -x /usr/bin/dnf ]; then
REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo dnf --repo="rpmbuild*" clean expire-cache)'
elif [ -x /usr/bin/zypper ]; then
REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
# REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
REPOUPDATE='(rsync -av --delete "${RPMDIR}/" "/tmp/rpm/"; cd /tmp/rpm; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; rsync -av --delete "/tmp/rpm/" "${RPMDIR}/"; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
elif [ -x /usr/bin/yum ]; then
if [ "$(rpm -E %dist)" = ".el5" ]; then
REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'

5
redhat/core/tdebase/pamd.kcheckpass-trinity.mga9
Unescape View File

@ -0,0 +1,5 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

11
redhat/core/tdebase/pamd.kdm-trinity-np.mga9
Unescape View File

@ -0,0 +1,11 @@
#%PAM-1.0
auth required pam_env.so
auth required pam_permit.so
account required pam_nologin.so
account include system-auth
password include system-auth
session required pam_loginuid.so
session optional pam_console.so
session optional pam_keyinit.so force revoke
session required pam_namespace.so
session include system-auth

15
redhat/core/tdebase/pamd.kdm-trinity.mga9
Unescape View File

@ -0,0 +1,15 @@
#%PAM-1.0
auth required pam_env.so
auth required pam_succeed_if.so
auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
auth substack system-auth
-auth optional pam_kwallet.so
account required pam_nologin.so
account include system-auth
password include system-auth
session required pam_loginuid.so
session optional pam_console.so
session optional pam_keyinit.so force revoke
session required pam_namespace.so
session include system-auth
-session optional pam_kwallet.so

5
redhat/core/tdebase/pamd.kscreensaver-trinity.mga9
Unescape View File

@ -0,0 +1,5 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

6
redhat/core/tdelibs/tdelibs.spec
Unescape View File

@ -148,8 +148,12 @@ BuildRequires: gamin-devel
# PCRE support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_pcre 1
%if 0%{?mgaversion} >= 9
BuildRequires: %{_lib}pcre-devel
%else
BuildRequires: pcre-devel
%endif
%endif
# INOTIFY support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@ -337,7 +341,7 @@ BuildRequires: file-devel
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
%define with_nm 1
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} != 8
%if 0%{?mgaversion} && 0%{?mgaversion} <= 7
BuildRequires: %{_lib}nm-util-devel
%endif
%endif

34
redhat/docker/mageia.sh
Unescape View File

@ -0,0 +1,34 @@
#!/bin/bash -e
NAME="mageia"
VERSION="${1:-9}" # E.g: '9'
IMAGE="${NAME}:${VERSION}"
INSTALLROOT="/dev/shm/${IMAGE}"
ARCH="x86_64"
sudo rm -rf "${INSTALLROOT}"
sudo mkdir -p "${INSTALLROOT}"
sudo dnf -y \
--disablerepo="*" \
--enablerepo="mageia-${ARCH},updates-${ARCH}" \
--installroot="${INSTALLROOT}" \
--releasever="${VERSION}" \
install \
\
bash \
mageia-release-common \
urpmi \
vim
sudo chroot "${INSTALLROOT}" rpmdb --rebuilddb
FILE="${IMAGE//\//_}.tar"
sudo tar -C "${INSTALLROOT}" -c . >"${FILE}"
sudo rm -rf "${INSTALLROOT}"
docker rmi -f "${IMAGE}"
docker import "${FILE}" "${IMAGE}"
pigz "${FILE}"
mkdir -p "${HOME}/tde/docker"
mv -fv "${FILE}.gz" "${HOME}/tde/docker"

2
redhat/docker/mga9/Dockerfile.i686
Unescape View File

@ -1,6 +1,6 @@
FROM mageia32:8
ARG TDE_VERSION=14.0.13
ARG TDE_VERSION=14.1.0
ARG ARCH=i686
# Reset URPMI repositories to default

32
redhat/docker/mga9/Dockerfile.x86_64
Unescape View File

@ -1,38 +1,36 @@
FROM mageia:9
ARG TDE_VERSION=14.0.13
ARG TDE_VERSION=14.1.0
ARG ARCH=x86_64
# Reset URPMI repositories to default
# Enable more URPMI repositories
RUN urpmi.removemedia -a \
&& urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/x86_64/ \
&& sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}"
# Enable english locales
RUN urpmi --replacepkgs glibc \
&& localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || :
# Update distribution
# Install Trinity build dependencies
COPY packages.${ARCH} /packages
RUN urpmi.update -a \
RUN set -x \
&& urpmi.removemedia -a \
&& urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/x86_64/ \
&& sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" \
&& urpmi.update -a \
&& urpmi --replacepkgs glibc \
&& localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || : \
&& urpmi --auto-select --auto \
&& urpmi --auto $(</packages)
# Enable ccache
RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
# Fix utempter detection
RUN chmod a+r /usr/libexec/utempter/utempter
# Fix poppler support
RUN sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|"
RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" \
&& chmod a+r /usr/libexec/utempter/utempter \
&& sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|"
# Add non-root user to build packages
RUN rm -rf /home/trinity \
&& useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \
&& echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
# Configure user trinity
USER trinity
@ -47,5 +45,5 @@ RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
&& sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
# Build development packages that are missing
RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/perl-PAR-Packer-1.51.0-2.mga8.src.rpm \
&& sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
#RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-Packer-1.57.0-1.mga9.src.rpm \
# && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"

3
redhat/docker/mga9/packages.i686
Unescape View File

@ -218,8 +218,7 @@ polkit-devel
postgresql13
postgresql13-devel
ppp
python-devel
python-sip
python3-devel
qt4-devel
readline-devel
recode

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

@ -69,7 +69,6 @@ karma-sharp
kde-dev-scripts
lib64apr-devel
lib64apr-util-devel
lib64avformat58
lib64binutils-devel
lib64boost_python3-devel
lib64cln-devel
@ -96,6 +95,7 @@ lib64jpeg-devel
lib64lua-devel
lib64mad-devel
lib64mp3lame-devel
lib64musicbrainz5-devel
lib64npth-devel
lib64paper-devel
lib64pkcs11-helper-devel
@ -150,7 +150,6 @@ libmng-devel
libmp4v2-devel
libmpcdec-devel
libmtp-devel
libmusicbrainz-devel
libnjb-devel
libofx-devel
libotr-devel
@ -221,8 +220,7 @@ polkit-devel
postgresql13
postgresql13-devel
ppp
python-devel
python-sip
python3-devel
qt4-devel
readline-devel
recode

2
redhat/docker/mga9/rpmmacros
Unescape View File

@ -1,5 +1,7 @@
%dist .mga9
%_smp_mflags -j8
%jobs 8
%__brp_remove_la_files %nil
%_program_prefix ""
%_debugsource_packages %nil
%_debugsource_template %nil

Write Preview
Loading…
Cancel
Save