RPM: support for upcoming Fedora 42 and 43

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

15 files changed, 30 insertions, 2 deletions

diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc42 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc42
new file mode 120000
index 000000000..bcd188214
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc42
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.fc39
\ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc43 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc43
new file mode 120000
index 000000000..bcd188214
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc43
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.fc39
\ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc42 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc42
new file mode 120000
index 000000000..9d4df92f4
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc42
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.fc39
\ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc43 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc43
new file mode 120000
index 000000000..9d4df92f4
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc43
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.fc39
\ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc42 b/redhat/core/tdebase/pamd.kdm-trinity.fc42
new file mode 120000
index 000000000..5022f14ef
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc42
@@ -0,0 +1 @@
+pamd.kdm-trinity.fc39
\ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc43 b/redhat/core/tdebase/pamd.kdm-trinity.fc43
new file mode 120000
index 000000000..5022f14ef
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc43
@@ -0,0 +1 @@
+pamd.kdm-trinity.fc39
\ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc42 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc42
new file mode 120000
index 000000000..a7b20accd
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc42
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.fc39
\ No newline at end of file
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc43 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc43
new file mode 120000
index 000000000..a7b20accd
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc43
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.fc39
\ No newline at end of file
diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec
index 0759676fd..ffb1728dc 100644
--- a/redhat/core/tdebase/tdebase.spec
+++ b/redhat/core/tdebase/tdebase.spec
@@ -130,7 +130,11 @@ BuildRequires:	brp-check-trinity
 
 # Fedora Theme
 %if 0%{?fedora}
+%if 0%{?fedora} >= 42
+Requires:	f41-backgrounds-base
+%else
 Requires:	f%{?fedora}-backgrounds-base
+%endif
 %if 0%{?fedora} >= 39
 %define tde_bg /usr/share/backgrounds/f%{?fedora}/default/f%{?fedora}-01-day.png
 %else
diff --git a/redhat/core/tdebase/tdm.fc42.te b/redhat/core/tdebase/tdm.fc42.te
new file mode 120000
index 000000000..6d3f39b54
--- /dev/null
+++ b/redhat/core/tdebase/tdm.fc42.te
@@ -0,0 +1 @@
+tdm.fc39.te
\ No newline at end of file
diff --git a/redhat/core/tdebase/tdm.fc43.te b/redhat/core/tdebase/tdm.fc43.te
new file mode 120000
index 000000000..6d3f39b54
--- /dev/null
+++ b/redhat/core/tdebase/tdm.fc43.te
@@ -0,0 +1 @@
+tdm.fc39.te
\ No newline at end of file
diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec
index 937692612..475722be0 100644
--- a/redhat/core/tdebindings/tdebindings.spec
+++ b/redhat/core/tdebindings/tdebindings.spec
@@ -249,10 +249,13 @@ BuildRequires: java-devel >= 1.4.2
 %if 0%{?suse_version} >= 1320
 BuildRequires:	java-1_8_0-openjdk-devel
 %endif
-%if 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5 || 0%{?rhel} >= 8
+%if 0%{?fedora} >= 42
+BuildRequires:	java-21-openjdk-devel
+%endif
+%if ( 0%{?fedora} >= 21 && 0%{?fedora} <= 41 ) || 0%{?mgaversion} >= 5 || 0%{?rhel} >= 8
 BuildRequires: java-1.8.0-openjdk-devel
 %endif
-%if 0%{?fedora} == 17 ||  0%{?fedora} == 18 ||  0%{?fedora} == 19 || 0%{?fedora} == 20 || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} == 3 || 0%{?mgaversion} == 4 || 0%{?rhel} == 7
+%if 0%{?fedora} == 17 || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?fedora} == 20 || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} == 3 || 0%{?mgaversion} == 4 || 0%{?rhel} == 7
 BuildRequires: java-1.7.0-openjdk-devel
 %endif
 %if 0%{?rhel} == 5 || 0%{?rhel} == 6
diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec
index 18cd144b9..077803e7b 100644
--- a/redhat/core/tdelibs/tdelibs.spec
+++ b/redhat/core/tdelibs/tdelibs.spec
@@ -822,6 +822,9 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit"
 %__rm -f "%{?buildroot}%{tde_bindir}/filesharelist"
 %__rm -f "%{?buildroot}%{tde_bindir}/fileshareset"
 
+%if 0%{?fedora} >= 43
+%__mv %{?buildroot}/opt/trinity/etc/xdg/ %{?buildroot}/etc/
+%endif
 
 %clean
 %__rm -rf "%{?buildroot}"
diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec
index e6f3d557c..8cad7c88f 100644
--- a/redhat/core/tdemultimedia/tdemultimedia.spec
+++ b/redhat/core/tdemultimedia/tdemultimedia.spec
@@ -1207,6 +1207,10 @@ export PATH="%{tde_bindir}:${PATH}"
 # Links duplicate files
 %fdupes "%{?buildroot}%{tde_datadir}"
 
+%if 0%{?fedora} >= 43
+%__mv %{?buildroot}/opt/trinity/etc/ %{?buildroot}/etc/
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec
index a210fea30..74d54fe95 100644
--- a/redhat/core/tdenetwork/tdenetwork.spec
+++ b/redhat/core/tdenetwork/tdenetwork.spec
@@ -1253,6 +1253,10 @@ done
 # Links duplicate files
 %fdupes "%{?buildroot}%{tde_datadir}"
 
+%if 0%{?fedora} >= 43
+%__mv %{?buildroot}/usr/etc/ppp/ %{?buildroot}/etc/
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}