RPM: update support for Opensuse TW

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

10 files changed, 21 insertions, 74 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index 4e41d2d91..39d74e2c1 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -197,7 +197,7 @@ libkipi: tqtinterface
 libksquirrel: tdelibs
 	$(call buildpkg,libraries/libksquirrel)
 
-libtdeldap: tqtinterface
+libtdeldap: tqtinterface libheimdal
 	$(call buildpkg,libraries/libtdeldap)
 
 libtqt-perl: tqtinterface
@@ -657,6 +657,11 @@ meta:
 fileshareset:
 	$(call buildpkg,extras/fileshareset)
 
+libheimdal:
+ifneq (,$(filter $(DIST), .osstw ))
+	$(call buildpkg,extras/libheimdal)
+endif
+
 pinentry-tqt: tqtinterface
 ifeq (,$(filter $(DIST), .el5 .el6 .el7 ))
 	$(call buildpkg,extras/pinentry-tqt)
diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec
index f4f538d23..8e3700d03 100644
--- a/redhat/applications/office/koffice/koffice.spec
+++ b/redhat/applications/office/koffice/koffice.spec
@@ -245,7 +245,7 @@ BuildRequires:	GraphicsMagick-devel >= 1.1.0
 %endif
 
 # UTEMPTER support
-%if 0%{?suse_version}
+%if 0%{?suse_version} && 0%{?suse_version} < 1699
 BuildRequires:	utempter-devel
 %endif
 %if 0%{?rhel} == 4
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index cae4e786b..70ab03468 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -22,7 +22,7 @@ case "${PKGNAME}" in
   # Most TDE dependencies have no prefix
   "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"polkit-tqt"|"pytqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";;
   # 3rd party dependencies
-  "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"libbeagle"|"mp4v2"|"pinentry-tqt"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
+  "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"libbeagle"|"libheimdal"|"mp4v2"|"pinentry-tqt"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
   # Extra build stuff
   "autoconf"|"automake"|"brp-check-trinity"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2"|"yaz") PREFIX="";;  # Other
   "curl") PREFIX="trinity-lib";;
@@ -53,6 +53,7 @@ case "${PKGNAME}" in
   "libbeagle")        PKGRUNTIME="${lib}beagle1";;
   "libcaldav")        PKGRUNTIME="${lib}caldav0";;
   "libcarddav")       PKGRUNTIME="${lib}carddav0";;
+  "libheimdal")       PKGRUNTIME="${lib}hdb9";;
   "libkdcraw")        PKGRUNTIME="${lib}kdcraw4";;
   "libkexiv2")        PKGRUNTIME="${lib}kexiv2-5";;
   "libkipi")          PKGRUNTIME="${lib}kipi0";;
diff --git a/redhat/core/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec
index cffa47049..44797b209 100644
--- a/redhat/core/tdesdk/tdesdk.spec
+++ b/redhat/core/tdesdk/tdesdk.spec
@@ -150,7 +150,7 @@ BuildRequires:	openssl-devel
 %endif
 
 # PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8 || 0%{?suse_version} >= 1500
 %define python python3
 %else
 %define python python
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index 59a9bcf9a..fef8b3092 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -20,30 +20,17 @@ RUN set -x \
 USER trinity
 COPY rpmmacros /home/trinity/.rpmmacros
 
-# Fix taglib headers to match actual built library (amarok, soundkonverter)
-RUN set -x \
- && sed -i "/usr/include/taglib/id3v1tag.h" -e "s|offset_t tagOffset|long tagOffset|" \
- && sed -i "/usr/include/taglib/tfile.h" -e "s|offset_t offset|long offset|" -e "s|offset_t start|long start|"
-
 # Add YUM repository for locally built packages
 RUN set -x \
+ && mkdir -p /home/trinity/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} \
  && 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
-COPY heimdal-7.8.0-ftbfs_osstw_i686.patch /home/trinity/rpmbuild/SOURCES
-RUN set -x \
- && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-4.1.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|.*|Patch0: heimdal-7.8.0-ftbfs_osstw_i686.patch|" \
- && LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" setarch ${ARCH} rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
- && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install
-
 # Add lilypond (i686 only)
 RUN set -x \
- && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.3.src.rpm \
+ && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.5.src.rpm \
  && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \
  && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \
  && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm"
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index 786107fe7..6efe437d5 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -13,23 +13,17 @@ RUN set -x \
  && zypper -n install --allow-vendor-change $(</packages)
 
 # Add non-root user to build packages
-RUN /usr/sbin/useradd -m -s /bin/bash -u 1000 trinity \
+RUN set -x \
+ && /usr/sbin/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} \
+RUN set -x \
+ && mkdir -p /home/trinity/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} \
+ && 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/tumbleweed/repo/oss/src/libheimdal-7.8.0-4.1.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|^|#|" \
- && export ac_cv_sys_large_files=no \
- && export ac_cv_sys_file_offset_bits=no \
- && LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
- && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install
diff --git a/redhat/docker/osstw/heimdal-7.8.0-ftbfs_osstw_i686.patch b/redhat/docker/osstw/heimdal-7.8.0-ftbfs_osstw_i686.patch
deleted file mode 100644
index b2cf2de50..000000000
--- a/redhat/docker/osstw/heimdal-7.8.0-ftbfs_osstw_i686.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/lib/libedit/src/common.c b/lib/libedit/src/common.c
-index 2708605..a166f29 100644
---- a/lib/libedit/src/common.c
-+++ b/lib/libedit/src/common.c
-@@ -366,12 +366,13 @@ libedit_private el_action_t
- ed_quoted_insert(EditLine *el, wint_t c)
- {
- 	int num;
-+	wchar_t ch;
- 
- 	tty_quotemode(el);
--	num = el_wgetc(el, &c);
-+	num = el_wgetc(el, &ch);
- 	tty_noquotemode(el);
- 	if (num == 1)
--		return ed_insert(el, c);
-+		return ed_insert(el, ch);
- 	else
- 		return ed_end_of_file(el, 0);
- }
-diff --git a/lib/libedit/src/search.c b/lib/libedit/src/search.c
-index 5226cf5..1cc8383 100644
---- a/lib/libedit/src/search.c
-+++ b/lib/libedit/src/search.c
-@@ -603,8 +603,10 @@ cv_csearch(EditLine *el, int direction, wint_t ch, int count, int tflag)
- 		return CC_ERROR;
- 
- 	if (ch == (wint_t)-1) {
--		if (el_wgetc(el, &ch) != 1)
-+		wchar_t c;
-+		if (el_wgetc(el, &c) != 1)
- 			return ed_end_of_file(el, 0);
-+		ch = c;
- 	}
- 
- 	/* Save for ';' and ',' commands */
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 3bf063281..6a28ed98d 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -46,7 +46,6 @@ font-util
 freeglut-devel
 freetype-devel
 fribidi-devel
-gamin-devel
 gcc-c++
 ghostscript-fonts-other mftrace
 giflib-devel
@@ -61,7 +60,6 @@ gstreamer-plugins-base-devel
 gtk2-devel
 gtk3-devel
 gtk-doc
-htdig
 html2ps
 hunspell-devel
 iceauth
@@ -93,6 +91,7 @@ libgadu-devel
 libgpgme-devel
 libgphoto2-devel
 libgpod-devel
+libgsf-devel
 libical-devel
 libidn-devel
 libiw-devel
@@ -195,9 +194,8 @@ postgresql-devel
 postgresql-server-devel
 potrace-devel
 ppp
-python-devel
-python-gtk-devel
 python3-devel
+python3-setuptools
 recode
 rpcgen
 rpm-build
@@ -231,17 +229,14 @@ texlive-sectsty
 texlive-stackengine
 texlive-lh
 texlive-tocloft
-torsocks
 transfig
 unixODBC-devel
 update-desktop-files
 usbutils
-utempter-devel
 valgrind
 vim
 wget
 wireless-tools
-wv2-devel
 xcb-proto-devel
 xorg-x11
 xscreensaver
diff --git a/redhat/docker/osstw/rpmmacros b/redhat/docker/osstw/rpmmacros
index 37788e61e..0d214f57c 100644
--- a/redhat/docker/osstw/rpmmacros
+++ b/redhat/docker/osstw/rpmmacros
@@ -3,3 +3,4 @@
 %jobs 8
 %python python3
 %__python %__python3
+%_enable_debug_packages %nil
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec
index 6eec0582d..680efa268 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec
@@ -185,7 +185,7 @@ done
 %__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g"
 %endif
 
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 || 0%{?sle_version} >= 150600
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 || 0%{?sle_version} >= 150600 || 0%{?suse_version} >= 1699
 %__sed -i "app_templates/kcontrol_module/setup.py" \
           "app_templates/kcontrol_module/src/kcontrol_module.py" \
           "app_templates/kdeapp/setup.py" \