RPM: update packaging for R14.1.5

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

4 files changed, 11 insertions, 5 deletions

diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity.spec b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
index 804e23d00..ae6118326 100644
--- a/redhat/extras/brp-check-trinity/brp-check-trinity.spec
+++ b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 %define tde_prefix /opt/trinity
 
diff --git a/redhat/extras/pinentry-tqt/pinentry-tqt.spec b/redhat/extras/pinentry-tqt/pinentry-tqt.spec
index c382b7bd4..e5f08a886 100644
--- a/redhat/extras/pinentry-tqt/pinentry-tqt.spec
+++ b/redhat/extras/pinentry-tqt/pinentry-tqt.spec
@@ -83,7 +83,7 @@ if [ -d "/usr/include/libassuan2" ]; then
   export CFLAGS="%{optflags} -I/usr/include/libassuan2"
 fi
 
-./autogen.sh
+#./autogen.sh
 
 %if 0%{?mgaversion} == 6 || 0%{?mgaversion} == 7 || 0%{?pclinuxos}
 %configure2_5x \
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 082ae1739..00a207ce0 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -16,7 +16,7 @@
 #
 
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -165,7 +165,7 @@ Requires: trinity-kooldock
 Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
 %if 0%{?sle_version} <= 150300 && 0%{?suse_version} != 1599 && 0%{?suse_version} != 1699
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 6
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || ( 0%{?rhel} >= 6 && 0%{?rhel} <= 9 )
 Requires: trinity-kpilot
 %endif
 %endif
@@ -235,6 +235,9 @@ Requires: trinity-tderadio
 Requires: trinity-tdesshaskpass
 Requires: trinity-tdesudo
 Requires: trinity-tdesvn
+%if 0%{?suse_version} <= 1699
+Requires: trinity-tdexsldbg
+%endif
 Requires: trinity-tdmtheme
 Requires: trinity-tellico
 Requires: trinity-tork
@@ -244,6 +247,8 @@ Requires: trinity-twin-style-fahrenheit
 Requires: trinity-twin-style-machbunt
 Requires: trinity-twin-style-mallory
 Requires: trinity-twin-style-suse2
+Requires: trinity-universal-indent-gui-tqt
+Requires: trinity-xdg-desktop-portal-tde
 Requires: trinity-wlassistant
 Requires: trinity-yakuake
 
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 11f2ae9ea..144dc4ca2 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -257,6 +257,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/hu/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/it/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/ja/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/nb/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/nl/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/pl/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/pt_BR/common