11 files changed, 64 insertions, 75 deletions

diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec
index 1a66c3a57..e3dbc568a 100644
--- a/redhat/applications/amarok/amarok.spec
+++ b/redhat/applications/amarok/amarok.spec
@@ -101,11 +101,23 @@ BuildRequires:	libtool-ltdl-devel
 
 BuildRequires:	libusb-devel
 BuildRequires:	mysql-devel
-BuildRequires:	postgresql-devel
 BuildRequires:	SDL-devel
 BuildRequires:	taglib-devel
 BuildRequires:	sqlite-devel
 
+# POSTGRESQL support
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+BuildRequires:	postgresql10
+BuildRequires:	postgresql10-devel
+%else
+BuildRequires: postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires: postgresql-server-devel
+%else
+BuildRequires: postgresql-devel
+%endif
+%endif
+
 # not used anymore, in favor of libvisual ? -- Rex
 #{?fedora:BuildRequires:  xmms-devel}
 
diff --git a/redhat/applications/digikam/digikam.spec b/redhat/applications/digikam/digikam.spec
index 8579c9918..5c4815399 100644
--- a/redhat/applications/digikam/digikam.spec
+++ b/redhat/applications/digikam/digikam.spec
@@ -308,9 +308,7 @@ Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %lang(nl) %{tde_tdedocdir}/HTML/nl/digikam/
 %lang(nl) %{tde_tdedocdir}/HTML/nl/showfoto/
 %lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/digikam/
-#lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/showfoto/
 %lang(ru) %{tde_tdedocdir}/HTML/ru/digikam/
-#lang(ru) %{tde_tdedocdir}/HTML/ru/showfoto/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/digikam/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/showfoto/
 
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec
index 3a30a8783..4120e4b9d 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3.spec
@@ -174,7 +174,7 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
 
 %files -f kgtk.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README.md TODO
+%doc AUTHORS ChangeLog COPYING README TODO
 %{tde_bindir}/kdialogd-wrapper
 %{tde_bindir}/kdialogd3
 %{tde_bindir}/kgtk-wrapper
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 23789e97e..6830f92d8 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -70,6 +70,12 @@ BuildRequires:	trinity-filesystem >= %{tde_version}
 
 BuildRequires:	gcc-c++
 
+# BISON support
+BuildRequires:  bison
+
+# FLEX support
+BuildRequires:	flex
+
 # PYTHON support
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
 %global python python2
@@ -82,7 +88,13 @@ BuildRequires:	gcc-c++
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
+# YACC support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+BuildRequires:  byacc
+%endif
+
 %description
+
 SIP is a tool for generating bindings for C++ classes with some ideas
 borrowed from SWIG, but capable of tighter bindings because of its
 specificity towards C++ and Python.
diff --git a/redhat/dependencies/tqscintilla/tqscintilla.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec
index 46f6cb1e5..5743a88bf 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla.spec
@@ -21,9 +21,6 @@
 %define tde_version 14.1.0
 %endif
 %define tde_pkg tqscintilla
-%define tde_prefix /opt/trinity
-%define tde_datadir %{tde_prefix}/share
-%define tde_tdedocdir %{tde_datadir}/doc/tde
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libtqscintilla %{_lib}tqscintilla
@@ -58,9 +55,10 @@ Source1:		trinity-tqscintilla-rpmlintrc
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-filesystem >= %{tde_version}
 
+BuildRequires:	cmake
 BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
 BuildRequires:	gcc-c++
+BuildRequires:	gettext
 
 %description
 Scintilla is a free source code editing component. It has features found
@@ -94,7 +92,6 @@ TQScintilla is a port or Scintilla to the TQt GUI toolkit.
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE NEWS README
 %{_libdir}/libqscintilla.so.7
-%{_libdir}/libqscintilla.so.7.0
 %{_libdir}/libqscintilla.so.7.0.1
 %{_libdir}/tqt3/plugins/designer/*.so
 %dir %{_datadir}/tqt3/translations/
@@ -120,9 +117,12 @@ This package contains the development files for tqscintilla.
 
 %files -n %{libtqscintilla}-devel
 %defattr(-,root,root,-)
-%doc doc/Scintilla example
+#%doc doc/Scintilla example
 %{_includedir}/tqscintilla/
 %{_libdir}/libqscintilla.so
+%{_libdir}/pkgconfig/qscintilla.pc
+%exclude %{_libdir}/libqscintilla.la
+%exclude %{_libdir}/tqt3/plugins/designer/*.la
 
 ##########
 
@@ -138,7 +138,8 @@ This package contains the documentation for tqscintilla.
 
 %files -n %{libtqscintilla}-doc
 %defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/en/%{name}/
+%{_docdir}/libtqscintilla7/
+%{_docdir}/libtqscintilla/HTML/en/tqscintilla/
 
 ##########
 
@@ -151,74 +152,37 @@ This package contains the documentation for tqscintilla.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# Fix path in project files
-%__sed -i "qt/qscintilla.pro" \
-  -e "s|^INCLUDEPATH = .*|INCLUDEPATH = . ../include ../src /usr/include/tqt /usr/include/tqt3|" \
-  -e "s|^header.path = .*|header.path = %{_includedir}/tqt3|" \
-  -e "s|^trans.path = .*|trans.path = %{_datadir}/tqt3/translations|"
-
-%__sed -i "designer/designer.pro" \
-  -e "s|\$(TQTDIR)|%{_libdir}/tqt3|" \
-  -e "s|# DESTDIR|DESTDIR|"
-
-export QTDIR=%{_libdir}/tqt3
-export TQTDIR=%{_prefix}
-( cd qt; tqmake "DESTDIR=$PWD/../tmplib" )
-( cd designer; tqmake )
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-# Workaround strange tqmake behaviour in RHEL5
-%if 0%{?rhel} == 5
-%__sed -i "qt/Makefile" -e "s|..\/..\/..\/..\/..|%{_prefix}|g"
-%endif
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL="ON" \
+  -DWITH_ALL_OPTIONS="ON" \
+  ..
 
-export QTDIR=%{_libdir}/tqt3
-export TQTDIR=%{_prefix}
-%__make %{?_smp_mflags} -C qt
-%__make %{?_smp_mflags} -C designer
+%__make %{?_smp_mflags} || %__make
 
 
 %install
-unset QTDIR QTINC QTLIB
-export QTDIR=%{_libdir}/tqt3
-export TQTDIR=%{_prefix}
-%__rm -rf $RPM_BUILD_ROOT
+%__rm -rf %{?buildroot}
+%__make install -C build DESTDIR=%{?buildroot}
 
-# Installs the QT part
-%__make INSTALL_ROOT=$RPM_BUILD_ROOT -C qt install
-
-# Installs supplementary headers
-for i in include/*.h; do
-  %__install -D -m 644 $i %{buildroot}${QTINC}/private/${i##*/}
-done
-
-# Installs the HTML documentation correctly
-for i in doc/html/*; do
-  %__install -D -m 644 $i %{buildroot}%{tde_tdedocdir}/HTML/en/%{name}/${i##*/}
-done
-
-# Installs the Designer plugin
-for i in designer/*.so ${QTDIR}/plugins/designer/*.so ${TQTDIR}/plugins/designer/*.so; do
-  [ -r "${i}" ] || continue
-  %__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/}
-done
-
-# Installs libraries
-%__mkdir_p %{buildroot}%{_libdir}
-%__mv -f tmplib/* %{buildroot}%{_libdir}
-
-# Fix private headers location
-%__mkdir_p %{buildroot}%{_includedir}
-%__mv -f %{buildroot}/private %{buildroot}%{_includedir}/tqt3
-%__mv -f %{buildroot}%{_includedir}/tqt3 %{buildroot}%{_includedir}/tqscintilla
-
-# Fix permissions
-chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h
-chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h
+# Fix headers location
+%__mv "%{?buildroot}%{_includedir}/tqt3" "%{?buildroot}%{_includedir}/tqscintilla"
 
 
 %clean
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index 6a07fbec7..0bd79c8ac 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -10,6 +10,7 @@ bison
 bluez-libs-devel
 boost-devel
 boost-python3-devel
+byacc
 bzip2-devel
 cdparanoia
 cdparanoia-devel
@@ -21,7 +22,7 @@ clucene-core-devel
 cmake
 cpp
 cppunit-devel
-createrepo
+createrepo_c
 cryptsetup-devel
 cups-devel
 dbus-glib-devel
diff --git a/redhat/docker/f35/packages b/redhat/docker/f35/packages
index 619279797..f541aa930 100644
--- a/redhat/docker/f35/packages
+++ b/redhat/docker/f35/packages
@@ -10,6 +10,7 @@ binutils-devel
 bison
 boost-devel
 boost-python3-devel
+byacc
 bzip2-devel
 ccache
 cdparanoia
@@ -22,7 +23,7 @@ clucene-core-devel
 cmake
 cpp
 cppunit-devel
-createrepo
+createrepo_c
 cryptsetup-devel
 cups-devel
 dbus-glib-devel
@@ -115,7 +116,6 @@ libogg-devel
 libotr-devel
 libpaper-devel
 libqalculate-devel
-libpqxx-devel
 libraw1394-devel
 librsvg2
 librsvg2-tools
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 0106b710e..60ef22ddc 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -272,6 +272,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/tr/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/uk/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/zh_CN/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/zh_Hans/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/zh_TW/common
 
 %__install -d -m 755 %{?buildroot}%{tde_includedir}
@@ -622,6 +623,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/xx/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_CN.GB2312/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_CN/LC_MESSAGES/
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_Hans/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_TW.Big5/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_TW/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zu/LC_MESSAGES/
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index 23bc95c3f..c8eb9b7ce 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -280,7 +280,7 @@ Requires:	fedora-logos
 # Fedora 35 Theme
 %if 0%{?fedora} == 35
 Requires:	f35-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f34/default/standard/f35.png
+%define tde_bg /usr/share/backgrounds/f35/default/standard/f35.png
 Requires:	fedora-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
 %endif
diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec
index 3a44d164b..31bd0aad7 100644
--- a/redhat/main/tdelibs/tdelibs.spec
+++ b/redhat/main/tdelibs/tdelibs.spec
@@ -379,7 +379,7 @@ Requires:		udisks
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 BuildRequires:	libudisks2-devel
 %else
-6+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
 BuildRequires:	libudisks2-0-devel
 %else
 BuildRequires:	udisks2-devel
diff --git a/redhat/main/tdetoys/tdetoys.spec b/redhat/main/tdetoys/tdetoys.spec
index fc8f62256..42652f272 100644
--- a/redhat/main/tdetoys/tdetoys.spec
+++ b/redhat/main/tdetoys/tdetoys.spec
@@ -62,7 +62,7 @@ Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 BuildRequires: trinity-kdesktop >= %{tde_version}
 BuildRequires: trinity-kicker >= %{tde_version}
-BuildRequires: trinity-konqueror >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++