From 5fe21c2f804d077bd292cee6e4ed18febb3733b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Thu, 11 May 2023 14:03:54 +0200
Subject: [PATCH] RPM: add distribution opensuse Leap 15.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: François Andriot <albator78@libertysurf.fr>
---
 redhat/Makefile                        |  12 +-
 redhat/build/update_repository.sh      |   3 +-
 redhat/docker/oss155/Dockerfile.x86_64 |  37 ++++
 redhat/docker/oss155/packages          | 224 +++++++++++++++++++++++++
 redhat/docker/oss155/rpmmacros         |   5 +
 5 files changed, 273 insertions(+), 8 deletions(-)
 create mode 100644 redhat/docker/oss155/Dockerfile.x86_64
 create mode 100644 redhat/docker/oss155/packages
 create mode 100644 redhat/docker/oss155/rpmmacros

diff --git a/redhat/Makefile b/redhat/Makefile
index af67c851b..e29fb3105 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -139,12 +139,12 @@ tdewebdev: tdebase tdesdk
 
 ### 3rd party libraries and tools
 brp-check-trinity:
-ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .osstw ))
+ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .oss155 .osstw ))
 	$(call buildpkg,3rdparty/brp-check-trinity)
 endif
 
 esound:
-ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .mga9 .oss151 .oss152 .oss153 .oss154 .osstw ))
+ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .mga9 .oss151 .oss152 .oss153 .oss154 .oss155 .osstw ))
 	$(call buildpkg,3rdparty/esound)
 endif
 
@@ -159,12 +159,12 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw ))
 endif
 
 lcms:
-ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .mga9 .oss151 .oss152 .oss153 .oss154 .osstw ))
+ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .mga9 .oss151 .oss152 .oss153 .oss154 .oss155 .osstw ))
 	$(call buildpkg,3rdparty/lcms)
 endif
 
 mp4v2:
-ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .osstw ))
+ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .oss155 .osstw ))
 	$(call buildpkg,3rdparty/mp4v2)
 endif
 
@@ -426,7 +426,7 @@ kpicosim: tdebase
 	$(call buildpkg,applications/development/kpicosim)
 
 kpilot: tdebase tdepim
-ifeq (,$(filter $(DIST),.el5 .oss154 .osstw))
+ifeq (,$(filter $(DIST),.el5 .oss154 .oss155 .osstw))
 	$(call buildpkg,applications/office/kpilot)
 endif
 
@@ -505,7 +505,7 @@ qalculate-tde:
 	$(call buildpkg,applications/utilities/qalculate-tde)
 
 qt4-tqt-theme-engine: tdebase
-ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .oss153 .oss154 .osstw))
+ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .oss153 .oss154 .oss155 .osstw))
 	$(call buildpkg,applications/themes/qt4-tqt-theme-engine)
 endif
 
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index 210c10d8d..c00078f1e 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -20,8 +20,7 @@ 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='(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)'
+  REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; 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/docker/oss155/Dockerfile.x86_64 b/redhat/docker/oss155/Dockerfile.x86_64
new file mode 100644
index 000000000..77479d93e
--- /dev/null
+++ b/redhat/docker/oss155/Dockerfile.x86_64
@@ -0,0 +1,37 @@
+FROM opensuse/leap:15.5
+
+ARG TDE_VERSION=14.1.0
+ARG ARCH=x86_64
+
+# Add PACKMAN repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN set -x \
+ && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
+ && echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \
+ && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.5/ packman \
+ && zypper -n refresh \
+ && zypper -n update \
+ && zypper -n install -l $(</packages)
+
+RUN ln -sfv python3 /usr/bin/python
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Add YUM repository for locally built packages
+RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
+ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
+
+# Install heimdal development files
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.5/repo/oss/src/libheimdal-7.8.0-bp155.2.3.src.rpm \
+ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \
+ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \
+ && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
+ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install
diff --git a/redhat/docker/oss155/packages b/redhat/docker/oss155/packages
new file mode 100644
index 000000000..6a1682741
--- /dev/null
+++ b/redhat/docker/oss155/packages
@@ -0,0 +1,224 @@
+alsa-devel
+aspell
+aspell-devel
+audiofile-devel
+automake
+bdftopcf
+binutils-devel
+bison
+brp-check-suse
+brp-extract-appdata
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cln-devel
+clucene-core-devel
+cmake
+createrepo_c
+cups-devel
+curl
+cyrus-sasl-devel
+dbus-1-devel
+dbus-1-glib-devel
+djvulibre
+docbook-utils
+docbook-xsl-stylesheets
+docbook2x
+doxygen GraphicsMagick
+dssi-devel
+fdupes
+ffmpeg-devel
+fftw3-devel
+file-devel
+flac-devel
+flex
+font-util
+freetype-devel
+fribidi-devel
+gamin-devel
+gcc-c++
+giflib-devel
+git
+glu-devel
+gmime-devel
+gmime2_6-devel
+gmp-devel
+gperf xmlto
+GraphicsMagick-devel
+gsl-devel
+gstreamer-devel
+gstreamer-plugins-base-devel 
+gstreamer-devel
+gtk2-devel
+gtk3-devel
+gtk-doc
+htdig
+html2ps
+hunspell-devel
+iceauth
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+java-1_8_0-openjdk-devel
+less
+libacl-devel
+libao-devel
+libart_lgpl-devel
+libavahi-devel
+libavcodec-devel
+libblkid-devel
+libboost_python-py3-1_66_0-devel
+libboost_system1_66_0-devel
+libbz2-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcryptsetup-devel
+libcurl-devel
+libdb-4_8-devel
+libdvdread-devel
+libexempi-devel
+libexiv2-devel
+libfontenc-devel
+libgadu-devel
+libGeoIP-devel
+libgpgme-devel
+libgphoto2-devel
+libgpod-devel
+libgssglue-devel
+libical-devel
+libICE-devel
+libidn-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libjpeg8-devel
+liblcms2-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel 
+libmysqld-devel
+libneon-devel
+libnjb-devel
+libnsl-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpng16-devel
+libpoppler-devel
+libpqxx-devel
+libpulse-devel
+libqalculate-devel
+libraw1394-devel
+librsvg-devel
+libsamplerate-devel
+libSDL-devel
+libSM-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libtag-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtwolame-devel
+libudev1
+libudisks2-0-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXdmcp-devel
+libxine-devel
+libxkbfile-devel
+libXpm-devel
+libXmu-devel
+libXScrnSaver-devel
+libxslt-devel
+libXt-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+make
+makeinfo
+meanwhile-devel
+Mesa-devel
+Mesa-libGL-devel
+mozilla-nspr-devel
+mysql-devel
+net-tools
+net-tools-deprecated
+NetworkManager-devel
+ocaml
+openexr-devel
+opensc
+openslp-devel
+opensp-devel
+pam-devel
+patch
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl(JSON)
+perl-PAR-Packer
+perl-pcsc
+pkcs11-helper-devel
+polkit-devel
+postgresql
+postgresql-devel
+postgresql-server-devel
+ppp
+python3-devel
+python3-sip-devel
+recode
+rpcgen
+rpm-build
+rpmlint
+rsvg-convert
+ruby
+ruby-devel
+sane-backends-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sudo
+swig
+sword-devel
+texinfo
+torsocks
+transfig
+unixODBC-devel
+update-desktop-files
+usbutils
+utempter-devel
+valgrind
+vim
+wget
+wireless-tools
+wv2-devel
+xbase-devel
+xcb-proto-devel
+xorg-x11
+xscreensaver
+xscreensaver-data
+xscreensaver-data-extra
+xz-devel
diff --git a/redhat/docker/oss155/rpmmacros b/redhat/docker/oss155/rpmmacros
new file mode 100644
index 000000000..3a9593ace
--- /dev/null
+++ b/redhat/docker/oss155/rpmmacros
@@ -0,0 +1,5 @@
+%dist .oss155
+%_smp_mflags -j8
+%jobs 8
+%sle_version 150500
+%_build_insert_debug_package %nil