RPM: add build scripts for Mageia 9

Signed-off-by: François Andriot <albator78@libertysurf.fr>

20 files changed, 143 insertions, 35 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index 84a08053a..af67c851b 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -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
 
diff --git a/redhat/applications/misc/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec
index c5bdb79e3..68af31207 100644
--- a/redhat/applications/misc/kcmldap/kcmldap.spec
+++ b/redhat/applications/misc/kcmldap/kcmldap.spec
@@ -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
diff --git a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
index e89b41917..c99c0b685 100644
--- a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
+++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
@@ -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
diff --git a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
index 181530823..bbe317e3d 100644
--- a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
+++ b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
@@ -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
diff --git a/redhat/applications/misc/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec
index cd6644d93..38e159c48 100644
--- a/redhat/applications/misc/kerberostray/kerberostray.spec
+++ b/redhat/applications/misc/kerberostray/kerberostray.spec
@@ -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
diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec
index d0aa408ce..dae74c9f6 100644
--- a/redhat/applications/multimedia/amarok/amarok.spec
+++ b/redhat/applications/multimedia/amarok/amarok.spec
@@ -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}
diff --git a/redhat/applications/office/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec
index 636c6deb2..0654010ce 100644
--- a/redhat/applications/office/tellico/tellico.spec
+++ b/redhat/applications/office/tellico/tellico.spec
@@ -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
diff --git a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
index bae1fa842..46d1c6d1a 100644
--- a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
+++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
@@ -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
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index c00078f1e..210c10d8d 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -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*")'
diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.mga9 b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga9
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga9
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.mga9 b/redhat/core/tdebase/pamd.kdm-trinity-np.mga9
new file mode 100644
index 000000000..f884c1de6
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.mga9
@@ -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
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.mga9 b/redhat/core/tdebase/pamd.kdm-trinity.mga9
new file mode 100644
index 000000000..cb0982c9a
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.mga9
@@ -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
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.mga9 b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga9
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga9
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec
index e66e5d75c..3d18d4954 100644
--- a/redhat/core/tdelibs/tdelibs.spec
+++ b/redhat/core/tdelibs/tdelibs.spec
@@ -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
diff --git a/redhat/docker/mageia.sh b/redhat/docker/mageia.sh
new file mode 100755
index 000000000..e0a84588a
--- /dev/null
+++ b/redhat/docker/mageia.sh
@@ -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"
diff --git a/redhat/docker/mga9/Dockerfile.i686 b/redhat/docker/mga9/Dockerfile.i686
index 46d2810d9..f465d0914 100644
--- a/redhat/docker/mga9/Dockerfile.i686
+++ b/redhat/docker/mga9/Dockerfile.i686
@@ -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
diff --git a/redhat/docker/mga9/Dockerfile.x86_64 b/redhat/docker/mga9/Dockerfile.x86_64
index 9d4ef301e..49053893b 100644
--- a/redhat/docker/mga9/Dockerfile.x86_64
+++ b/redhat/docker/mga9/Dockerfile.x86_64
@@ -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"
diff --git a/redhat/docker/mga9/packages.i686 b/redhat/docker/mga9/packages.i686
index a39a701af..c44677fa0 100644
--- a/redhat/docker/mga9/packages.i686
+++ b/redhat/docker/mga9/packages.i686
@@ -218,8 +218,7 @@ polkit-devel
 postgresql13
 postgresql13-devel
 ppp
-python-devel
-python-sip
+python3-devel
 qt4-devel
 readline-devel
 recode
diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64
index 998e0c682..324364b40 100644
--- a/redhat/docker/mga9/packages.x86_64
+++ b/redhat/docker/mga9/packages.x86_64
@@ -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
diff --git a/redhat/docker/mga9/rpmmacros b/redhat/docker/mga9/rpmmacros
index 2bc3bb37f..a92be537d 100644
--- a/redhat/docker/mga9/rpmmacros
+++ b/redhat/docker/mga9/rpmmacros
@@ -1,5 +1,7 @@
+%dist .mga9
 %_smp_mflags -j8
 %jobs 8
+%__brp_remove_la_files %nil
 %_program_prefix ""
 %_debugsource_packages %nil
 %_debugsource_template %nil