From 721172d43e5f2626ab7d8ecc48b3d4c3e6201b3c Mon Sep 17 00:00:00 2001 From: François Andriot Date: Mon, 28 Sep 2026 21:59:52 +0200 Subject: RPM: update core packages (merge from r14.1.x) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/core/tdeaccessibility/tdeaccessibility.spec | 8 +- redhat/core/tdeaddons/tdeaddons.spec | 15 +- redhat/core/tdeadmin/tdeadmin.spec | 4 +- redhat/core/tdeartwork/tdeartwork.spec | 21 +- redhat/core/tdebase/pamd.kcheckpass-trinity.el10 | 1 + redhat/core/tdebase/pamd.kcheckpass-trinity.fc41 | 1 + redhat/core/tdebase/pamd.kcheckpass-trinity.fc42 | 1 + redhat/core/tdebase/pamd.kcheckpass-trinity.fc43 | 1 + redhat/core/tdebase/pamd.kcheckpass-trinity.fc44 | 1 + redhat/core/tdebase/pamd.kcheckpass-trinity.fc45 | 1 + redhat/core/tdebase/pamd.kcheckpass-trinity.fc46 | 1 + redhat/core/tdebase/pamd.kcheckpass-trinity.mga10 | 5 + redhat/core/tdebase/pamd.kcheckpass-trinity.omv | 10 + .../core/tdebase/pamd.kcheckpass-trinity.pclos2024 | 1 + .../core/tdebase/pamd.kcheckpass-trinity.pclos2025 | 1 + .../core/tdebase/pamd.kcheckpass-trinity.pclos2026 | 1 + redhat/core/tdebase/pamd.kdm-trinity-np.el10 | 1 + redhat/core/tdebase/pamd.kdm-trinity-np.fc41 | 1 + redhat/core/tdebase/pamd.kdm-trinity-np.fc42 | 1 + redhat/core/tdebase/pamd.kdm-trinity-np.fc43 | 1 + redhat/core/tdebase/pamd.kdm-trinity-np.fc44 | 1 + redhat/core/tdebase/pamd.kdm-trinity-np.fc45 | 1 + redhat/core/tdebase/pamd.kdm-trinity-np.fc46 | 1 + redhat/core/tdebase/pamd.kdm-trinity-np.mga10 | 11 + redhat/core/tdebase/pamd.kdm-trinity-np.omv | 10 + redhat/core/tdebase/pamd.kdm-trinity-np.pclos2024 | 1 + redhat/core/tdebase/pamd.kdm-trinity-np.pclos2025 | 1 + redhat/core/tdebase/pamd.kdm-trinity-np.pclos2026 | 1 + redhat/core/tdebase/pamd.kdm-trinity.el10 | 1 + redhat/core/tdebase/pamd.kdm-trinity.fc41 | 1 + redhat/core/tdebase/pamd.kdm-trinity.fc42 | 1 + redhat/core/tdebase/pamd.kdm-trinity.fc43 | 1 + redhat/core/tdebase/pamd.kdm-trinity.fc44 | 1 + redhat/core/tdebase/pamd.kdm-trinity.fc45 | 1 + redhat/core/tdebase/pamd.kdm-trinity.fc46 | 1 + redhat/core/tdebase/pamd.kdm-trinity.mga10 | 15 + redhat/core/tdebase/pamd.kdm-trinity.omv | 10 + redhat/core/tdebase/pamd.kdm-trinity.pclos2024 | 1 + redhat/core/tdebase/pamd.kdm-trinity.pclos2025 | 1 + redhat/core/tdebase/pamd.kdm-trinity.pclos2026 | 1 + redhat/core/tdebase/pamd.kscreensaver-trinity.el10 | 1 + redhat/core/tdebase/pamd.kscreensaver-trinity.fc41 | 1 + redhat/core/tdebase/pamd.kscreensaver-trinity.fc42 | 1 + redhat/core/tdebase/pamd.kscreensaver-trinity.fc43 | 1 + redhat/core/tdebase/pamd.kscreensaver-trinity.fc44 | 1 + redhat/core/tdebase/pamd.kscreensaver-trinity.fc45 | 1 + redhat/core/tdebase/pamd.kscreensaver-trinity.fc46 | 1 + .../core/tdebase/pamd.kscreensaver-trinity.mga10 | 5 + redhat/core/tdebase/pamd.kscreensaver-trinity.omv | 10 + .../tdebase/pamd.kscreensaver-trinity.pclos2024 | 1 + .../tdebase/pamd.kscreensaver-trinity.pclos2025 | 1 + .../tdebase/pamd.kscreensaver-trinity.pclos2026 | 1 + redhat/core/tdebase/pamd.tde.omv5000 | 10 - redhat/core/tdebase/tdebase.spec | 365 ++++++++++++--------- redhat/core/tdebase/tdm.el10.te | 1 + redhat/core/tdebase/tdm.el8.te | 10 +- redhat/core/tdebase/tdm.fc39.te | 20 +- redhat/core/tdebase/tdm.fc41.te | 1 + redhat/core/tdebase/tdm.fc42.te | 1 + redhat/core/tdebase/tdm.fc43.te | 1 + redhat/core/tdebase/tdm.fc44.te | 1 + redhat/core/tdebase/tdm.fc45.te | 1 + redhat/core/tdebase/tdm.fc46.te | 1 + redhat/core/tdebase/tdm.oss160.te | 27 ++ redhat/core/tdebase/tdm.osstw.te | 1 + redhat/core/tdebase/tdm.service.el9 | 1 - redhat/core/tdebase/tdm.service.fc34 | 12 - redhat/core/tdebase/tdm.service.fc35 | 12 - redhat/core/tdebase/tdm.service.fc36 | 12 - redhat/core/tdebase/tdm.service.fc37 | 12 - redhat/core/tdebase/tdm.service.mga8 | 12 - redhat/core/tdebindings/tdebindings.spec | 45 ++- redhat/core/tdeedu/tdeedu.spec | 2 +- redhat/core/tdegraphics/tdegraphics.spec | 47 ++- redhat/core/tdelibs/tdelibs.spec | 137 ++++---- redhat/core/tdemultimedia/tdemultimedia.spec | 36 +- redhat/core/tdenetwork/tdenetwork.spec | 23 +- redhat/core/tdepim/tdepim.spec | 24 +- redhat/core/tdesdk/tdesdk.spec | 15 +- redhat/core/tdetoys/tdetoys.spec | 8 +- redhat/core/tdeutils/tdeutils.spec | 22 +- redhat/core/tdevelop/tdevelop.spec | 12 +- redhat/core/tdewebdev/tdewebdev.spec | 68 +--- 83 files changed, 593 insertions(+), 511 deletions(-) create mode 120000 redhat/core/tdebase/pamd.kcheckpass-trinity.el10 create mode 120000 redhat/core/tdebase/pamd.kcheckpass-trinity.fc41 create mode 120000 redhat/core/tdebase/pamd.kcheckpass-trinity.fc42 create mode 120000 redhat/core/tdebase/pamd.kcheckpass-trinity.fc43 create mode 120000 redhat/core/tdebase/pamd.kcheckpass-trinity.fc44 create mode 120000 redhat/core/tdebase/pamd.kcheckpass-trinity.fc45 create mode 120000 redhat/core/tdebase/pamd.kcheckpass-trinity.fc46 create mode 100644 redhat/core/tdebase/pamd.kcheckpass-trinity.mga10 create mode 100644 redhat/core/tdebase/pamd.kcheckpass-trinity.omv create mode 120000 redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2024 create mode 120000 redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2025 create mode 120000 redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2026 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity-np.el10 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity-np.fc41 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity-np.fc42 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity-np.fc43 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity-np.fc44 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity-np.fc45 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity-np.fc46 create mode 100644 redhat/core/tdebase/pamd.kdm-trinity-np.mga10 create mode 100644 redhat/core/tdebase/pamd.kdm-trinity-np.omv create mode 120000 redhat/core/tdebase/pamd.kdm-trinity-np.pclos2024 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity-np.pclos2025 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity-np.pclos2026 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity.el10 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity.fc41 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity.fc42 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity.fc43 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity.fc44 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity.fc45 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity.fc46 create mode 100644 redhat/core/tdebase/pamd.kdm-trinity.mga10 create mode 100644 redhat/core/tdebase/pamd.kdm-trinity.omv create mode 120000 redhat/core/tdebase/pamd.kdm-trinity.pclos2024 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity.pclos2025 create mode 120000 redhat/core/tdebase/pamd.kdm-trinity.pclos2026 create mode 120000 redhat/core/tdebase/pamd.kscreensaver-trinity.el10 create mode 120000 redhat/core/tdebase/pamd.kscreensaver-trinity.fc41 create mode 120000 redhat/core/tdebase/pamd.kscreensaver-trinity.fc42 create mode 120000 redhat/core/tdebase/pamd.kscreensaver-trinity.fc43 create mode 120000 redhat/core/tdebase/pamd.kscreensaver-trinity.fc44 create mode 120000 redhat/core/tdebase/pamd.kscreensaver-trinity.fc45 create mode 120000 redhat/core/tdebase/pamd.kscreensaver-trinity.fc46 create mode 100644 redhat/core/tdebase/pamd.kscreensaver-trinity.mga10 create mode 100644 redhat/core/tdebase/pamd.kscreensaver-trinity.omv create mode 120000 redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2024 create mode 120000 redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2025 create mode 120000 redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2026 delete mode 100644 redhat/core/tdebase/pamd.tde.omv5000 create mode 120000 redhat/core/tdebase/tdm.el10.te create mode 120000 redhat/core/tdebase/tdm.fc41.te create mode 120000 redhat/core/tdebase/tdm.fc42.te create mode 120000 redhat/core/tdebase/tdm.fc43.te create mode 120000 redhat/core/tdebase/tdm.fc44.te create mode 120000 redhat/core/tdebase/tdm.fc45.te create mode 120000 redhat/core/tdebase/tdm.fc46.te create mode 100644 redhat/core/tdebase/tdm.oss160.te create mode 120000 redhat/core/tdebase/tdm.osstw.te delete mode 120000 redhat/core/tdebase/tdm.service.el9 delete mode 100644 redhat/core/tdebase/tdm.service.fc34 delete mode 100644 redhat/core/tdebase/tdm.service.fc35 delete mode 100644 redhat/core/tdebase/tdm.service.fc36 delete mode 100644 redhat/core/tdebase/tdm.service.fc37 delete mode 100644 redhat/core/tdebase/tdm.service.mga8 diff --git a/redhat/core/tdeaccessibility/tdeaccessibility.spec b/redhat/core/tdeaccessibility/tdeaccessibility.spec index 11e761634..b1c48dbef 100644 --- a/redhat/core/tdeaccessibility/tdeaccessibility.spec +++ b/redhat/core/tdeaccessibility/tdeaccessibility.spec @@ -87,7 +87,13 @@ BuildRequires: brp-check-trinity %endif # AUDIOFILE support +%if 0%{?rhel} >= 10 +%else +%define with_audiofile 1 +%endif +%if 0%{?with_audiofile} BuildRequires: audiofile-devel +%endif # AKODE support %define with_akode 1 @@ -100,7 +106,7 @@ BuildRequires: trinity-akode-devel %endif # ALSA support -%if "%{?distribution}" == "OpenMandriva Lx" +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel diff --git a/redhat/core/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec index 767dfc5f3..23627187e 100644 --- a/redhat/core/tdeaddons/tdeaddons.spec +++ b/redhat/core/tdeaddons/tdeaddons.spec @@ -89,14 +89,12 @@ BuildRequires: brp-check-trinity # SDL support %if 0%{?mdkver} BuildRequires: %{_lib}SDL-devel -%elif 0%{?suse_version} -BuildRequires: sdl12_compat-devel %else BuildRequires: SDL-devel %endif # ALSA supportl -%if "%{?distribution}" == "OpenMandriva Lx" +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel @@ -119,14 +117,11 @@ BuildRequires: libidn-devel BuildRequires: gamin-devel %endif -# PCRE support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_pcre 1 -%if 0%{?suse_version} -BuildRequires: pcre2-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel %else -BuildRequires: pcre-devel -%endif +BuildRequires: pcre2-devel %endif # ACL support diff --git a/redhat/core/tdeadmin/tdeadmin.spec b/redhat/core/tdeadmin/tdeadmin.spec index 13bc3e09f..808f49e40 100644 --- a/redhat/core/tdeadmin/tdeadmin.spec +++ b/redhat/core/tdeadmin/tdeadmin.spec @@ -291,10 +291,10 @@ Group: System/GUI/Other %if 0%{?with_consolehelper} # package 'usermode' provides '/usr/bin/consolehelper-gtk' -%if 0%{?rhel} || 0%{?fedora} +%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?fedora} Requires: usermode-gtk %endif -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 10 Requires: usermode %endif %endif diff --git a/redhat/core/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec index 95d3b03b7..631ac13c4 100644 --- a/redhat/core/tdeartwork/tdeartwork.spec +++ b/redhat/core/tdeartwork/tdeartwork.spec @@ -90,24 +90,20 @@ BuildRequires: libacl-devel %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if "%{?distribution}" == "OpenMandriva Lx" -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel %endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-Mesa-libGLU -%endif # LIBART support %define with_libart 1 @@ -119,7 +115,7 @@ BuildRequires: libart_lgpl-devel # RHEL 7: available in NUX # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -168,9 +164,12 @@ BuildRequires: xscreensaver-gl %if 0%{?mgaversion} || 0%{?mdkversion} %define jack_devel %{_lib}jack-devel %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} +%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?fedora} %define jack_devel jack-audio-connection-kit-devel %endif +%if 0%{?rhel} >= 10 +%define jack_devel pipewire-jack-audio-connection-kit-devel +%endif %if 0%{?suse_version} %define jack_devel libjack-devel %endif diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.el10 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el10 new file mode 120000 index 000000000..dab729b22 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el10 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.el7 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc41 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc41 new file mode 120000 index 000000000..bcd188214 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc41 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.fc39 \ No newline at end of file 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.kcheckpass-trinity.fc44 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc44 new file mode 120000 index 000000000..bcd188214 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc44 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.fc39 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc45 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc45 new file mode 120000 index 000000000..bcd188214 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc45 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.fc39 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.fc46 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc46 new file mode 120000 index 000000000..bcd188214 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc46 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.fc39 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.mga10 b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga10 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga10 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.omv b/redhat/core/tdebase/pamd.kcheckpass-trinity.omv new file mode 100644 index 000000000..9e0557414 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.omv @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth required pam_env.so +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth include system-auth +account include system-auth +password include system-auth +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session required pam_loginuid.so diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2024 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2024 new file mode 120000 index 000000000..ad0fc6da6 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2024 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.pclos2018 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2025 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2025 new file mode 120000 index 000000000..ad0fc6da6 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2025 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.pclos2018 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2026 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2026 new file mode 120000 index 000000000..ad0fc6da6 --- /dev/null +++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2026 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.pclos2018 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.el10 b/redhat/core/tdebase/pamd.kdm-trinity-np.el10 new file mode 120000 index 000000000..3415e7d55 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el10 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.el7 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc41 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc41 new file mode 120000 index 000000000..9d4df92f4 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc41 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.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-np.fc44 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc44 new file mode 120000 index 000000000..9d4df92f4 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc44 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.fc39 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc45 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc45 new file mode 120000 index 000000000..9d4df92f4 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc45 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.fc39 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.fc46 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc46 new file mode 120000 index 000000000..9d4df92f4 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc46 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.fc39 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.mga10 b/redhat/core/tdebase/pamd.kdm-trinity-np.mga10 new file mode 100644 index 000000000..f884c1de6 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.mga10 @@ -0,0 +1,11 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_loginuid.so +session optional pam_console.so +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.omv b/redhat/core/tdebase/pamd.kdm-trinity-np.omv new file mode 100644 index 000000000..9e0557414 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.omv @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth required pam_env.so +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth include system-auth +account include system-auth +password include system-auth +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session required pam_loginuid.so diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2024 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2024 new file mode 120000 index 000000000..5cde6e2c5 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2024 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.pclos2018 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2025 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2025 new file mode 120000 index 000000000..5cde6e2c5 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2025 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.pclos2018 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2026 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2026 new file mode 120000 index 000000000..5cde6e2c5 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2026 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.pclos2018 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity.el10 b/redhat/core/tdebase/pamd.kdm-trinity.el10 new file mode 120000 index 000000000..f85413ec6 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.el10 @@ -0,0 +1 @@ +pamd.kdm-trinity.el7 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc41 b/redhat/core/tdebase/pamd.kdm-trinity.fc41 new file mode 120000 index 000000000..5022f14ef --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.fc41 @@ -0,0 +1 @@ +pamd.kdm-trinity.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.kdm-trinity.fc44 b/redhat/core/tdebase/pamd.kdm-trinity.fc44 new file mode 120000 index 000000000..5022f14ef --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.fc44 @@ -0,0 +1 @@ +pamd.kdm-trinity.fc39 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc45 b/redhat/core/tdebase/pamd.kdm-trinity.fc45 new file mode 120000 index 000000000..5022f14ef --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.fc45 @@ -0,0 +1 @@ +pamd.kdm-trinity.fc39 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity.fc46 b/redhat/core/tdebase/pamd.kdm-trinity.fc46 new file mode 120000 index 000000000..5022f14ef --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.fc46 @@ -0,0 +1 @@ +pamd.kdm-trinity.fc39 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity.mga10 b/redhat/core/tdebase/pamd.kdm-trinity.mga10 new file mode 100644 index 000000000..cb0982c9a --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.mga10 @@ -0,0 +1,15 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_succeed_if.so +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth substack system-auth +-auth optional pam_kwallet.so +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_loginuid.so +session optional pam_console.so +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_kwallet.so diff --git a/redhat/core/tdebase/pamd.kdm-trinity.omv b/redhat/core/tdebase/pamd.kdm-trinity.omv new file mode 100644 index 000000000..9e0557414 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.omv @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth required pam_env.so +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth include system-auth +account include system-auth +password include system-auth +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session required pam_loginuid.so diff --git a/redhat/core/tdebase/pamd.kdm-trinity.pclos2024 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2024 new file mode 120000 index 000000000..fcc6957f7 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2024 @@ -0,0 +1 @@ +pamd.kdm-trinity.pclos2018 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity.pclos2025 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2025 new file mode 120000 index 000000000..fcc6957f7 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2025 @@ -0,0 +1 @@ +pamd.kdm-trinity.pclos2018 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kdm-trinity.pclos2026 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2026 new file mode 120000 index 000000000..fcc6957f7 --- /dev/null +++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2026 @@ -0,0 +1 @@ +pamd.kdm-trinity.pclos2018 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.el10 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el10 new file mode 120000 index 000000000..a5fab9e3e --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el10 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.el7 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc41 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc41 new file mode 120000 index 000000000..a7b20accd --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc41 @@ -0,0 +1 @@ +pamd.kscreensaver-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/pamd.kscreensaver-trinity.fc44 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc44 new file mode 120000 index 000000000..a7b20accd --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc44 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.fc39 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc45 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc45 new file mode 120000 index 000000000..a7b20accd --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc45 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.fc39 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.fc46 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc46 new file mode 120000 index 000000000..a7b20accd --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc46 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.fc39 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.mga10 b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga10 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga10 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.omv b/redhat/core/tdebase/pamd.kscreensaver-trinity.omv new file mode 100644 index 000000000..9e0557414 --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.omv @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth required pam_env.so +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth include system-auth +account include system-auth +password include system-auth +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session required pam_loginuid.so diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2024 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2024 new file mode 120000 index 000000000..31d43e302 --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2024 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.pclos2018 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2025 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2025 new file mode 120000 index 000000000..31d43e302 --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2025 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.pclos2018 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2026 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2026 new file mode 120000 index 000000000..31d43e302 --- /dev/null +++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2026 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.pclos2018 \ No newline at end of file diff --git a/redhat/core/tdebase/pamd.tde.omv5000 b/redhat/core/tdebase/pamd.tde.omv5000 deleted file mode 100644 index 9e0557414..000000000 --- a/redhat/core/tdebase/pamd.tde.omv5000 +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth required pam_env.so -auth sufficient pam_succeed_if.so user ingroup nopasswdlogin -auth include system-auth -account include system-auth -password include system-auth -session optional pam_keyinit.so force revoke -session required pam_namespace.so -session include system-auth -session required pam_loginuid.so diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec index d48403568..e0c52d169 100644 --- a/redhat/core/tdebase/tdebase.spec +++ b/redhat/core/tdebase/tdebase.spec @@ -63,13 +63,16 @@ Source1: %{name}-rpmlintrc # Pam configuration files for RHEL / Fedora %if 0%{?suse_version} == 0 -%if 0%{?mdkver} -Source2: pamd.tde.omv5000 +%if 0%{?mdkver} >= 5000000 +Source2: pamd.kdm-trinity.omv +Source3: pamd.kdm-trinity-np.omv +Source4: pamd.kcheckpass-trinity.omv +Source5: pamd.kscreensaver-trinity.omv %else -Source2: pamd.kdm-trinity%{?pamd_suffix} -Source3: pamd.kdm-trinity-np%{?pamd_suffix} -Source4: pamd.kcheckpass-trinity%{?pamd_suffix} -Source5: pamd.kscreensaver-trinity%{?pamd_suffix} +Source2: pamd.kdm-trinity%{?dist} +Source3: pamd.kdm-trinity-np%{?dist} +Source4: pamd.kcheckpass-trinity%{?dist} +Source5: pamd.kscreensaver-trinity%{?dist} %endif %endif @@ -90,7 +93,7 @@ Source7: xdm%{?dist} # audit2allow -i /tmp/file -m tdm.fc17 >tdm.fc17.te # audit2allow -i /tmp/file -M tdm.fc17 -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1600 %define with_selinux_policy 1 Source8: tdm%{?dist}.te %endif @@ -127,10 +130,17 @@ BuildRequires: brp-check-trinity # Fedora Theme %if 0%{?fedora} -Requires: f%{?fedora}-backgrounds-base -%define tde_bg /usr/share/backgrounds/f%{?fedora}/default/standard/%{?fedora}.png +Requires: desktop-backgrounds-compat +%define tde_bg /usr/share/backgrounds/default.png Requires: fedora-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png + +# Starting with Fedora 42, the default background is provided in JXL format, not PNG. +# We need to convert it during package build, since TDE does not support JXL. +%if 0%{?fedora} >= 42 +BuildRequires: desktop-backgrounds-compat +BuildRequires: ImageMagick +%endif %endif # RHEL 4 Theme @@ -164,16 +174,25 @@ Requires: redhat-logos # RHEL 8 Theme %if 0%{?rhel} == 8 -Requires: redhat-logos -%define tde_bg /usr/share/backgrounds/c8/default/normalish/c8.png +Requires: system-backgrounds +Requires: system-logos +%define tde_bg /usr/share/backgrounds/default.jpg %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png %endif # RHEL 9 Theme %if 0%{?rhel} == 9 -#Requires: redhat-backgrounds -Requires: redhat-logos -%define tde_bg /usr/share/backgrounds/rocky-default-9-abstract-1-day.png +Requires: system-backgrounds +Requires: system-logos +%define tde_bg /usr/share/backgrounds/default.png +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png +%endif + +# RHEL 10 Theme +%if 0%{?rhel} == 10 +Requires: system-backgrounds +Requires: system-logos +%define tde_bg /usr/share/backgrounds/default.png %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png %endif @@ -192,7 +211,7 @@ Requires: mandriva-theme %endif # OpenMandriva -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 Requires: distro-release-theme %define tde_bg /usr/share/wallpapers/default.png %endif @@ -203,27 +222,16 @@ Requires: desktop-common-data %define tde_starticon /usr/share/icons/pclinuxos.png %endif -# OpenSuse 15.x Theme -%if "%{?suse_version}" == "1500" -Requires: wallpaper-branding -%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg -%endif - -# OpenSuse TW Theme -%if "%{?suse_version}" == "1699" +# OpenSuse 15.x (and later) Theme +%if 0%{?suse_version} >= 1500 Requires: wallpaper-branding -%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg +%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/default.png Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} -%if 0%{?suse_version} -BuildRequires: tqt3-dev-tools >= 3.5.0 -%endif BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ @@ -231,24 +239,28 @@ BuildRequires: make BuildRequires: fdupes # HTDIG support -%if 0%{?suse_version} -# Tumbleweed no longer provides htdig; the source supports disabling its search handlers. -%else BuildRequires: htdig -%endif # OPENSSL support -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}openssl-devel +Requires: %{_lib}ssl3 %else BuildRequires: openssl-devel +Requires: openssl %endif # AUDIOFILE support +%if 0%{?rhel} >= 10 +%else +%define with_audiofile 1 +%endif +%if 0%{?with_audiofile} BuildRequires: audiofile-devel +%endif # ALSA supportl -%if "%{?distribution}" == "OpenMandriva Lx" +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel @@ -262,8 +274,12 @@ BuildRequires: libraw1394-devel %endif # VORBIS support -%if 0%{?mdkver} || 0%{?mgaversion} +%if 0%{?mdkver} || 0%{?mgaversion} || 0%{?pclinuxos} +%if 0%{?pclinuxos} +%define libvorbis_devel %{_lib}vorbis0-devel +%else %define libvorbis_devel %{_lib}vorbis-devel +%endif %else %define libvorbis_devel libvorbis-devel %endif @@ -273,15 +289,20 @@ BuildRequires: %{libvorbis_devel} BuildRequires: glib2-devel # PCRE support -%if 0%{?suse_version} -BuildRequires: pcre2-devel -%else +%if 0%{?suse_version} == 0 && ( 0%{?rhel} && 0%{?rhel} <= 9 ) BuildRequires: pcre-devel %endif +# PCRE2 support +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif + # SASL support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}sasl-devel %else BuildRequires: %{_lib}sasl2-devel @@ -291,11 +312,6 @@ BuildRequires: %{_lib}sasl2-devel BuildRequires: cyrus-sasl-devel %endif -# Alternatives support -%if 0%{?suse_version} >= 1500 -BuildRequires: update-alternatives -%endif - # PAM support BuildRequires: pam-devel @@ -304,7 +320,7 @@ BuildRequires: pam-devel BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else -%if 0%{?fedora} >= 37 +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 BuildRequires: libusb1-devel BuildRequires: libusb-compat-0.1-devel %else @@ -313,7 +329,7 @@ BuildRequires: libusb-devel %endif # ESOUND support -#if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +#if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} #define with_esound 1 #BuildRequires: esound-devel #endif @@ -323,14 +339,14 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} && 0%{?rhel} <= 8 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?rhel} && 0%{?rhel} <= 8 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %define with_gamin 1 BuildRequires: gamin-devel %endif # OPENLDAP support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%if 0%{?mdkver} >= 5000000 BuildRequires: lib64ldap-devel %else BuildRequires: openldap-devel @@ -344,7 +360,7 @@ BuildRequires: openldap24-libs-devel %endif # SENSORS support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} BuildRequires: lm_sensors-devel %endif %if 0%{?suse_version} @@ -353,12 +369,16 @@ BuildRequires: libsensors4-devel # TSAK support (requires libudev-devel) # On RHEL5, udev is built statically, so TSAK cannot build. -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version} %if 0%{?suse_version} >= 1310 BuildRequires: udev %endif -%if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif @@ -375,13 +395,13 @@ BuildRequires: libacl-devel # XRANDR support # On RHEL5, xrandr library is too old. -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version} %define with_xrandr 1 %endif # XTEST support # On RHEL4, xtest library is too old. -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?suse_version} %define with_xtest 1 %endif @@ -393,15 +413,16 @@ BuildRequires: hal-devel >= 0.5 %endif # OPENEXR support -# Disabled on RHEL4 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} -%define with_exr 1 -%if 0%{?mdkver} +#define with_openexr 1 +%if 0%{?with_openexr} +%if 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}openexr-devel %else BuildRequires: OpenEXR-devel %endif %endif +%endif # XSCREENSAVER support # RHEL 4: disabled @@ -410,7 +431,7 @@ BuildRequires: OpenEXR-devel # RHEL 7: available in NUX # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -432,7 +453,7 @@ BuildRequires: xscreensaver-data BuildRequires: xscreensaver-data-extra %endif -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %if 0%{?mgaversion} >= 4 BuildRequires: %{_lib}xscrnsaver-devel %else @@ -449,21 +470,20 @@ BuildRequires: xscreensaver-gl # AVAHI support # Disabled on RHEL4 and RHEL5 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version} BuildRequires: libavahi-tqt-devel %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if "%{?distribution}" == "OpenMandriva Lx" -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel @@ -477,9 +497,7 @@ BuildRequires: Mesa-libGLU-devel BuildRequires: dbus-devel >= 0.22-12.EL.9p1 Requires: dbus-qt >= 0.22-12.EL.9p1 %else -BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63 BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9 -Requires: libdbus-tqt-1-0 >= %{tde_epoch}:0.63 %endif %if 0%{?fedora} >= 17 @@ -494,7 +512,7 @@ BuildRequires: libart_lgpl-devel %if 0%{?rhel} == 4 BuildRequires: samba-common %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} %if 0%{?mdkver} BuildRequires: %{_lib}smbclient-devel %else @@ -503,7 +521,7 @@ BuildRequires: libsmbclient-devel %endif # IMAKE -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220 +%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} >= 1220 BuildRequires: imake %endif @@ -511,19 +529,19 @@ BuildRequires: imake %if 0%{?suse_version} == 1140 BuildRequires: xorg-x11-libxkbfile-devel %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210 -%if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} >= 1210 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: %{_lib}xkbfile-devel %else BuildRequires: libxkbfile-devel %endif -%if 0%{?fedora} || 0%{?mdkver} || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?mdkver} >= 5000000 || 0%{?rhel} >= 7 BuildRequires: xkeyboard-config-devel %endif %endif # XDMCP support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %if 0%{?mgaversion} >= 4 BuildRequires: %{_lib}xdmcp-devel %else @@ -535,7 +553,7 @@ BuildRequires: libXdmcp-devel %endif # XTST support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %if 0%{?mgaversion} >= 4 %define xtst_devel %{_lib}xtst-devel %else @@ -548,7 +566,7 @@ BuildRequires: libXdmcp-devel %{?xtst_devel:BuildRequires: %{xtst_devel}} # XDAMAGE support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}xdamage-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 @@ -562,7 +580,7 @@ BuildRequires: usbutils %if 0%{?suse_version} == 1140 BuildRequires: xorg-x11-libfontenc-devel %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220 +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} >= 1220 BuildRequires: libfontenc-devel %endif @@ -571,7 +589,7 @@ BuildRequires: libfontenc-devel BuildRequires: xorg-x11-devel %endif -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: x11-font-util BuildRequires: x11-proto-devel %endif @@ -592,17 +610,17 @@ BuildRequires: font-util BuildRequires: bdftopcf %endif -%if 0%{?mdkver} < 24090000 -%if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} < 5000000 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: drakconf %endif %endif # LIBCONFIG support # Needed for "compton" stuff -%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} +%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} %define with_libconfig 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}config-devel %else BuildRequires: libconfig-devel @@ -610,12 +628,12 @@ BuildRequires: libconfig-devel %endif # KBDLEDSYNC support -%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} +%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} %define with_kbdledsync 1 %endif # TDERANDR support -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} %define with_tderandrtray 1 %endif @@ -629,15 +647,21 @@ BuildRequires: libr-devel >= 0.6.0 %if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 || 0%{?pclinuxos} BuildRequires: libtirpc-devel BuildRequires: rpcgen -%if 0%{?fedora} +%endif + +# NSL support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 28 BuildRequires: libnsl2-devel -%else +%endif +%if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1600 BuildRequires: libnsl-devel %endif +%if 0%{?mdkver} || 0%{?mgaversion} +BuildRequires: %{_lib}nsl-devel %endif # ATTR support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %define libattr_devel %{_lib}attr-devel %else %define libattr_devel libattr-devel @@ -645,9 +669,11 @@ BuildRequires: libnsl-devel BuildRequires: %{libattr_devel} # SELINUX support -%if 0%{?rhel} >= 6 || 0%{?fedora} +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} >= 1600 BuildRequires: checkpolicy BuildRequires: selinux-policy-devel +# Require the 'semanage' utility +Requires: policycoreutils-python-utils %endif # LIBSSH support @@ -696,7 +722,6 @@ Requires: %{name}-tdeio-smb-plugin = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-arts >= %{tde_epoch}:1.5.10 Requires: trinity-tdelibs >= %{tde_version} -Requires: openssl # RHEL 6 Configuration files are provided in separate packages @@ -1240,6 +1265,15 @@ plugdev group. %{tde_tdeappdir}/tdehwdevicetray.desktop %{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop +# tdesyndaemon +%{tde_bindir}/tdesyndaemon +%{tde_tdeappdir}/touchpad.desktop +%{tde_datadir}/apps/tdeconf_update/remote_folder_icon.upd +%{tde_datadir}/apps/tdeconf_update/remote_folder_icon_upd.sh +%{tde_datadir}/icons/crystalsvg/*/devices/input-touchpad.png +%{tde_datadir}/icons/crystalsvg/scalable/devices/input-touchpad.svg +%{tde_datadir}/services/kded/khotkeys.desktop + # The following features are not compiled under RHEL 5 and older %if 0%{?with_tderandrtray} %{tde_bindir}/tderandrtray @@ -1280,10 +1314,12 @@ Group: System/GUI/Other Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: pam %if 0%{?rhel} >= 7 -Requires: xorg-x11-server-Xorg -Requires: xorg-x11-drv-evdev Requires: dejavu-sans-fonts %endif +%if 0%{?rhel} >= 7 && 0%{?rhel} <= 9 +Requires: xorg-x11-drv-evdev +Requires: xorg-x11-server-Xorg +%endif Provides: tdebase-bin = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: tdebase-bin < %{?epoch:%{epoch}:}%{version}-%{release} @@ -1919,8 +1955,7 @@ group. %{tde_tdedocdir}/HTML/en/tdeioslave/ %{tde_mandir}/man1/ktrash.1* %{tde_mandir}/man1/tdeio_media_mounthelper.1* - -%if 0%{?with_exr} +%if 0%{?with_openexr} %{tde_tdelibdir}/exrthumbnail.la %{tde_tdelibdir}/exrthumbnail.so %{tde_datadir}/services/exrthumbnail.desktop @@ -2062,7 +2097,7 @@ Requires: %{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release} Requires: eject -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} Requires: xdg-utils %endif @@ -2116,13 +2151,9 @@ Requires: %{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: pam Requires: logrotate -%if 0%{?suse_version} >= 1500 -Requires(post): update-alternatives -Requires(postun): update-alternatives -%endif # Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession) -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4 +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 4 Requires: xinitrc %endif %if 0%{?suse_version} == 1140 @@ -2131,7 +2162,7 @@ Requires: xorg-x11 %if 0%{?suse_version} >= 1220 Requires: xdm %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} +%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 0 ) || 0%{?fedora} Requires: xorg-x11-xinit %endif @@ -2140,7 +2171,7 @@ Requires: xorg-x11-xinit Provides: service(graphical-login) %endif # Required for Mandriva's installer -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} Provides: dm Provides: %{tdm} %endif @@ -2180,9 +2211,6 @@ already. Most users won't need this. %{tdm_datadir}/sessions/*.desktop %{tdm_datadir}/themes/ %config(noreplace) %{tde_confdir}/%{tdm} -%if 0%{?with_selinux_policy} -%exclude %{tde_confdir}/%{tdm}/tdm.pp -%endif %{tde_tdedocdir}/HTML/en/%{tdm}/ %if 0%{?suse_version} == 0 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity @@ -2211,24 +2239,19 @@ already. Most users won't need this. %if 0%{?suse_version} >= 1210 /usr/lib/X11/displaymanagers/ %endif -%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} >= 7 +%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?suse_version} >= 1600 || 0%{?pclinuxos} || 0%{?rhel} >= 7 /usr/lib/systemd/system/tdm.service %endif -%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %{_datadir}/xsessions/tde.desktop %endif # https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %{_sysconfdir}/X11/wmsession.d/45TDE %{_datadir}/X11/dm.d/45TDE.conf %endif -# SELINUX policy -%if 0%{?with_selinux_policy} -%config %{tde_confdir}/%{tdm}/tdm.pp -%endif - # Logrotate configuration %config %{_sysconfdir}/logrotate.d/trinity-tdm @@ -2257,20 +2280,15 @@ if [ ! -L "%{tdm_datadir}/pics/users" ] && [ -d "%{tdm_datadir}/pics/users" ] ; fi %post -n trinity-tdm -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %make_session %endif -# SELINUX context for tdm %if 0%{?with_selinux_policy} +# SELINUX context for tdm /usr/sbin/semodule -i "%{tde_confdir}/%{tdm}/tdm.pp" -%endif - -%if 0%{?fedora} == 21 || 0%{?rhel} >= 7 -if ! grep -q "%{tde_bindir}/tdm" "/etc/selinux/targeted/contexts/files/file_contexts.local" ; then - echo "%{tde_bindir}/tdm -- system_u:object_r:xdm_exec_t" >>"/etc/selinux/targeted/contexts/files/file_contexts.local" - restorecon "%{tde_bindir}/tdm" -fi +semanage fcontext -a -t xdm_exec_t "%{tde_bindir}/tdm" +restorecon "%{tde_bindir}/tdm" %endif # Sets default user icon in TDM @@ -2286,13 +2304,15 @@ if [ "$1" = "1" ]; then fi fi +%if 0%{?suse_version} # openSUSE 11.4 tdm's startup script if [ -r "%{_sysconfdir}/init.d/xdm.tde" ]; then cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm" fi +%endif -# openSUSE 15.0 alternatives %if 0%{?suse_version} >= 1500 +# openSUSE 15.0 alternatives update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanager default-displaymanager /usr/lib/X11/displaymanagers/tdm 30 || : %endif @@ -2304,10 +2324,15 @@ if [ -d "%{tde_confdir}/%{tdm}.migr" ] && [ -d "%{tde_confdir}/%{tdm}" ]; then fi %postun -n trinity-tdm -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %make_session %endif +%if 0%{?with_selinux_policy} +# SELINUX context for tdm +/usr/sbin/semodule -R "tdm" +%endif + # openSUSE 15.0 alternatives %if 0%{?suse_version} >= 1500 if [ "$1" = "0" ]; then @@ -2360,9 +2385,7 @@ workstations. Summary: Help center for TDE Group: System/GUI/Other Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} -%if ! 0%{?suse_version} Requires: htdig -%endif %description -n trinity-khelpcenter The TDE Help Center provides documentation on how to use the TDE desktop. @@ -2372,15 +2395,11 @@ documentation. %files -n trinity-khelpcenter %defattr(-,root,root,-) -%if ! 0%{?suse_version} %{tde_bindir}/khc_docbookdig.pl %{tde_bindir}/khc_htdig.pl %{tde_bindir}/khc_htsearch.pl -%endif %{tde_bindir}/khc_indexbuilder -%if ! 0%{?suse_version} %{tde_bindir}/khc_mansearch.pl -%endif %{tde_bindir}/khelpcenter %{tde_tdelibdir}/khelpcenter.la %{tde_tdelibdir}/khelpcenter.so @@ -2613,10 +2632,6 @@ Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kfind = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?suse_version} >= 1500 -Requires(post): update-alternatives -Requires(preun): update-alternatives -%endif %description -n trinity-konqueror Konqueror is the file manager for the Trinity Desktop Environment. @@ -2721,7 +2736,7 @@ ever launching another application. %exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop %{tde_datadir}/apps/konqueror/servicemenus/*.desktop -%if 0%{?mdkver} < 24090000 +%if 0%{?mdkver} < 5000000 %ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase %endif @@ -2743,7 +2758,7 @@ ever launching another application. %{tde_mandir}/man1/kfmclient.1* %{tde_mandir}/man1/konqueror.1* -%if 0%{?mdkver} < 24090000 +%if 0%{?mdkver} < 5000000 %post -n trinity-konqueror if [ $1 -eq 1 ]; then @@ -2907,10 +2922,6 @@ Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release} Requires: xmessage Requires: xprop -%if 0%{?suse_version} >= 1500 -Requires(post): update-alternatives -Requires(postun): update-alternatives -%endif %description -n trinity-ksmserver This package contains the TDE session manager. It is responsible for @@ -2939,6 +2950,9 @@ TDE will start, but many good defaults will not be set. %{tde_datadir}/apps/tdeconf_update/move_session_config.sh %{tde_datadir}/apps/ksmserver/ %{tde_mandir}/man1/starttde.1* +%if 0%{?fedora} >= 42 +%{_datadir}/backgrounds/default.png +%endif %post -n trinity-ksmserver # openSUSE 15.0 alternatives @@ -2946,9 +2960,31 @@ TDE will start, but many good defaults will not be set. update-alternatives --install /usr/share/xsessions/default.desktop default-xsession.desktop /usr/share/xsessions/tde.desktop 30 || : %endif +%if 0%{?rhel} >= 8 +if [ ! -r "%{tde_bg}" ]; then + # Update wallpaper at install time, if required + # AlmaLinux 8 / AlmaLinux 9 + if [ -r "/usr/share/backgrounds/Alma-dark-1800x1440.jpg" ]; then + ln -sfv "/usr/share/backgrounds/Alma-dark-1800x1440.jpg" "%{tde_bg}" + # AlmaLinux 10 + elif [ -r "/usr/share/backgrounds/almalinux-day.jpg" ]; then + ln -sfv "/usr/share/backgrounds/almalinux-day.jpg" "%{tde_bg}" + # RockyLinux 8 + elif [ -r "/usr/share/backgrounds/rocky8/default/standard/logo-dark.png" ]; then + ln -sfv "/usr/share/backgrounds/rocky8/default/standard/logo-dark.png" "%{tde_bg}" + # RockyLinux 9 + elif [ -r "/usr/share/backgrounds/rocky-default-9-abstract-1-day.png" ]; then + ln -sfv "/usr/share/backgrounds/rocky-default-9-abstract-1-day.png" "%{tde_bg}" + # RockyLinux 10 + elif [ -r "/usr/share/backgrounds/rocky-default-10-abstract-1-day.png" ]; then + ln -sfv "/usr/share/backgrounds/rocky-default-10-abstract-1-day.png" "%{tde_bg}" + fi +fi +%endif + %postun -n trinity-ksmserver -%if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} < 24090000 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%if 0%{?mdkver} < 5000000 fndSession %endif %endif @@ -3268,7 +3304,7 @@ Windows and Samba shares. %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} # Applies an optional distro-specific graphical theme -%if "%{?tde_bg}" != "" +%if "%{?tde_bg}" != "" && 0%{?rhel} <= 7 # TDM Background %__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" \ -e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|' @@ -3404,7 +3440,7 @@ fi -DWITH_SASL=ON \ -DWITH_LDAP=ON \ -DWITH_SAMBA=ON \ - %{?!with_exr:-DWITH_OPENEXR=OFF} \ + %{?!with_openexr:-DWITH_OPENEXR=OFF} \ -DWITH_XCOMPOSITE=ON \ -DWITH_XCURSOR=ON \ -DWITH_XFIXES=ON \ @@ -3424,11 +3460,6 @@ fi -DWITH_SHADOW=OFF \ -DWITH_XDMCP=ON \ -DWITH_XINERAMA=ON \ - %if 0%{?suse_version} - -DWITH_HTDIG=OFF \ - %else - -DWITH_HTDIG=ON \ - %endif -DWITH_ARTS=ON \ -DWITH_I8K=ON \ -DWITH_SENSORS=ON \ @@ -3452,8 +3483,15 @@ fi %if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320 -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \ %endif -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver} +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver} || 0%{?suse_version} >= 1600 || 0%{?pclinuxos} -DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \ +%endif + \ +%if 0%{?suse_version} + -HALT_BINARY="/usr/sbin/halt" \ + -DPOWEROFF_BINARY="/usr/sbin/poweroff" \ + -DREBOOT_BINARY="/usr/sbin/reboot" \ + -DSHUTDOWN_BINARY="/usr/sbin/shutdown" \ %endif .. @@ -3479,7 +3517,7 @@ fi # Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora # Generated files for TDM/KDM4 go to '/usr/share/apps/kdm/sessions' -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d cat <"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE" NAME=TDE @@ -3502,28 +3540,21 @@ FNDSESSION_EXEC="/usr/sbin/chksession -k" %if 0%{?mgaversion} >= 6 FNDSESSION_EXEC="/usr/sbin/chksession -l" %endif -EOF %endif +EOF %endif # PAM configuration files (except openSUSE) %if 0%{?suse_version} == 0 -%if 0%{?mdkver} -%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity" -%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np" -%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" -%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity" -%else %__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity" %__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np" %__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" %__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity" %endif -%endif # TDM configuration %__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \ -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 || 0%{?mdkver} +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 || 0%{?mdkver} || 0%{?pclinuxos} -e "s/^#*MinShowUID=.*/MinShowUID=1000/" %else -e "s/^#*MinShowUID=.*/MinShowUID=500/" @@ -3538,7 +3569,7 @@ elif [ -r "/usr/share/hwdata/usb.ids" ]; then %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" fi -%if 0%{?mdkver} < 24090000 +%if 0%{?mdkver} < 5000000 # Makes 'media_safelyremove.desktop' an alternative. # This allows the use of 'tdeio-umountwrapper' package. %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" @@ -3553,13 +3584,19 @@ fi %__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g" %endif -# SELINUX policy for RHEL / Fedora +# SELINUX policy %if 0%{?with_selinux_policy} %__cp -f "%{SOURCE8}" "tdm.te" %__make -f "%{_datadir}/selinux/devel/Makefile" %__install -D -m 644 -D "tdm.pp" "%{?buildroot}%{tde_confdir}/%{tdm}/tdm.pp" %endif +# Fedora 42 background conversion to PNG +%if 0%{?fedora} >= 42 +%__install -d "%{?buildroot}%{_datadir}/backgrounds" +magick "%{_datadir}/backgrounds/default.jxl" "%{?buildroot}%{_datadir}/backgrounds/default.png" +%endif + # Mageia icon for TDE menu %if 0%{?mgaversion} >= 3 %__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/icons/oxygen/scalable/mgabutton.svg" @@ -3628,7 +3665,7 @@ for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i popd # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Help.desktop Documentation Viewer %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Home.desktop System FileManager core %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kate.desktop TextEditor diff --git a/redhat/core/tdebase/tdm.el10.te b/redhat/core/tdebase/tdm.el10.te new file mode 120000 index 000000000..034e33247 --- /dev/null +++ b/redhat/core/tdebase/tdm.el10.te @@ -0,0 +1 @@ +tdm.el8.te \ No newline at end of file diff --git a/redhat/core/tdebase/tdm.el8.te b/redhat/core/tdebase/tdm.el8.te index 519ca0506..598a11d0d 100644 --- a/redhat/core/tdebase/tdm.el8.te +++ b/redhat/core/tdebase/tdm.el8.te @@ -2,10 +2,10 @@ module tdm 1.0; require { - type fprintd_t; - type init_t; - class dbus send_msg; + type etc_t; + type xdm_t; + class file { create write }; } -#============= fprintd_t ============== -allow fprintd_t init_t:dbus send_msg; +#============= xdm_t ============== +allow xdm_t etc_t:file { create write }; diff --git a/redhat/core/tdebase/tdm.fc39.te b/redhat/core/tdebase/tdm.fc39.te index f3bcb40d4..5aaab7775 100644 --- a/redhat/core/tdebase/tdm.fc39.te +++ b/redhat/core/tdebase/tdm.fc39.te @@ -3,28 +3,22 @@ module tdm 1.0; require { type etc_t; - type fprintd_t; - type init_t; type tmp_t; - type unconfined_service_t; - type unconfined_t; type var_lib_t; type var_run_t; type xdm_t; - class capability2 mac_admin; - class dbus send_msg; - class fifo_file { getattr open read setattr unlink }; + class dir watch; + class fifo_file { getattr open read unlink }; class file { create entrypoint getattr lock map open read rename unlink write }; class lnk_file unlink; - class process transition; + class sock_file unlink; } -allow fprintd_t init_t:dbus send_msg; -allow unconfined_service_t unconfined_t:process transition; -allow unconfined_t self:capability2 mac_admin; -allow xdm_t etc_t:file { create rename unlink write }; -allow xdm_t tmp_t:fifo_file { getattr open read setattr unlink }; +allow xdm_t etc_t:file { create entrypoint rename unlink write }; +allow xdm_t tmp_t:dir watch; +allow xdm_t tmp_t:fifo_file { getattr open read unlink }; allow xdm_t tmp_t:file { map open unlink }; allow xdm_t tmp_t:lnk_file unlink; +allow xdm_t tmp_t:sock_file unlink; allow xdm_t var_lib_t:file { unlink }; allow xdm_t var_run_t:file { getattr lock open read write }; diff --git a/redhat/core/tdebase/tdm.fc41.te b/redhat/core/tdebase/tdm.fc41.te new file mode 120000 index 000000000..6d3f39b54 --- /dev/null +++ b/redhat/core/tdebase/tdm.fc41.te @@ -0,0 +1 @@ +tdm.fc39.te \ No newline at end of file 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/tdebase/tdm.fc44.te b/redhat/core/tdebase/tdm.fc44.te new file mode 120000 index 000000000..6d3f39b54 --- /dev/null +++ b/redhat/core/tdebase/tdm.fc44.te @@ -0,0 +1 @@ +tdm.fc39.te \ No newline at end of file diff --git a/redhat/core/tdebase/tdm.fc45.te b/redhat/core/tdebase/tdm.fc45.te new file mode 120000 index 000000000..6d3f39b54 --- /dev/null +++ b/redhat/core/tdebase/tdm.fc45.te @@ -0,0 +1 @@ +tdm.fc39.te \ No newline at end of file diff --git a/redhat/core/tdebase/tdm.fc46.te b/redhat/core/tdebase/tdm.fc46.te new file mode 120000 index 000000000..6d3f39b54 --- /dev/null +++ b/redhat/core/tdebase/tdm.fc46.te @@ -0,0 +1 @@ +tdm.fc39.te \ No newline at end of file diff --git a/redhat/core/tdebase/tdm.oss160.te b/redhat/core/tdebase/tdm.oss160.te new file mode 100644 index 000000000..115c7ae12 --- /dev/null +++ b/redhat/core/tdebase/tdm.oss160.te @@ -0,0 +1,27 @@ +module tdm 1.0; + +require { + type xdm_t; + type net_conf_t; + type etc_t; + type var_run_t; + type tmp_t; + class file { create entrypoint getattr lock open read write }; + class dir { add_name create watch }; + class lnk_file unlink; + class fifo_file { create getattr open read setattr unlink write }; + class sock_file { create setattr }; +} + +#============= xdm_t ============== + +allow xdm_t etc_t:file { create write }; +allow xdm_t net_conf_t:dir { add_name create }; +allow xdm_t net_conf_t:fifo_file { create open read setattr write }; +allow xdm_t net_conf_t:file { create write }; +allow xdm_t net_conf_t:sock_file { create setattr }; + +allow xdm_t tmp_t:dir watch; +allow xdm_t tmp_t:fifo_file { getattr open read unlink }; +allow xdm_t tmp_t:lnk_file unlink; +allow xdm_t var_run_t:file { getattr lock open read write }; diff --git a/redhat/core/tdebase/tdm.osstw.te b/redhat/core/tdebase/tdm.osstw.te new file mode 120000 index 000000000..39f6f213d --- /dev/null +++ b/redhat/core/tdebase/tdm.osstw.te @@ -0,0 +1 @@ +tdm.oss160.te \ No newline at end of file diff --git a/redhat/core/tdebase/tdm.service.el9 b/redhat/core/tdebase/tdm.service.el9 deleted file mode 120000 index 87f56ea08..000000000 --- a/redhat/core/tdebase/tdm.service.el9 +++ /dev/null @@ -1 +0,0 @@ -tdm.service.el7 \ No newline at end of file diff --git a/redhat/core/tdebase/tdm.service.fc34 b/redhat/core/tdebase/tdm.service.fc34 deleted file mode 100644 index 9ef7e07ff..000000000 --- a/redhat/core/tdebase/tdm.service.fc34 +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=The Trinity login manager -Conflicts=getty@tty1.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service - -[Service] -ExecStart=/opt/trinity/bin/tdm -Restart=always -IgnoreSIGPIPE=no - -[Install] -Alias=display-manager.service diff --git a/redhat/core/tdebase/tdm.service.fc35 b/redhat/core/tdebase/tdm.service.fc35 deleted file mode 100644 index 9ef7e07ff..000000000 --- a/redhat/core/tdebase/tdm.service.fc35 +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=The Trinity login manager -Conflicts=getty@tty1.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service - -[Service] -ExecStart=/opt/trinity/bin/tdm -Restart=always -IgnoreSIGPIPE=no - -[Install] -Alias=display-manager.service diff --git a/redhat/core/tdebase/tdm.service.fc36 b/redhat/core/tdebase/tdm.service.fc36 deleted file mode 100644 index 9ef7e07ff..000000000 --- a/redhat/core/tdebase/tdm.service.fc36 +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=The Trinity login manager -Conflicts=getty@tty1.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service - -[Service] -ExecStart=/opt/trinity/bin/tdm -Restart=always -IgnoreSIGPIPE=no - -[Install] -Alias=display-manager.service diff --git a/redhat/core/tdebase/tdm.service.fc37 b/redhat/core/tdebase/tdm.service.fc37 deleted file mode 100644 index 9ef7e07ff..000000000 --- a/redhat/core/tdebase/tdm.service.fc37 +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=The Trinity login manager -Conflicts=getty@tty1.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service - -[Service] -ExecStart=/opt/trinity/bin/tdm -Restart=always -IgnoreSIGPIPE=no - -[Install] -Alias=display-manager.service diff --git a/redhat/core/tdebase/tdm.service.mga8 b/redhat/core/tdebase/tdm.service.mga8 deleted file mode 100644 index eda2906e2..000000000 --- a/redhat/core/tdebase/tdm.service.mga8 +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Trinity Display Manager -Documentation=man:tdm(1) -Conflicts=getty@tty1.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service - -[Service] -ExecStart=/opt/trinity/bin/tdm -Restart=always - -[Install] -Alias=display-manager.service diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec index ad1172991..04a87c93d 100644 --- a/redhat/core/tdebindings/tdebindings.spec +++ b/redhat/core/tdebindings/tdebindings.spec @@ -116,7 +116,7 @@ Requires: evolution28-pango BuildRequires: evolution28-atk-devel Requires: evolution28-atk %else -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gtk+2.0-devel %else BuildRequires: gtk2-devel @@ -173,16 +173,15 @@ BuildRequires: gdk-pixbuf-devel %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if "%{?distribution}" == "OpenMandriva Lx" -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel @@ -256,13 +255,19 @@ BuildRequires: java-devel # Others use OpenJDK BuildRequires: java-openjdk BuildRequires: java-devel >= 1.4.2 -%if 0%{?suse_version} >= 1320 +%if 0%{?suse_version} >= 1320 && 0%{?suse_version} < 1600 BuildRequires: java-1_8_0-openjdk-devel %endif -%if 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 44 +BuildRequires: java-25-openjdk-devel +%endif +%if 0%{?fedora} == 42 || 0%{?fedora} == 43 || 0%{?rhel} >= 10 || 0%{?suse_version} >= 1600 +BuildRequires: java-21-openjdk-devel +%endif +%if ( 0%{?fedora} >= 21 && 0%{?fedora} <= 41 ) || 0%{?mgaversion} >= 5 || ( 0%{?rhel} >= 8 && 0%{?rhel} <= 9 ) 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} <= 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 @@ -273,7 +278,7 @@ BuildRequires: java-1.6.0-openjdk-devel %endif %if 0%{?suse_version} -%define java_home %{_usr}/%{_lib}/jvm/java-1.8.0-openjdk +%define java_home %{_usr}/%{_lib}/jvm/java-21-openjdk %else %if 0%{?rhel} == 4 %define java_home %{_usr}/lib/jvm/java-1.4.2-gcj-1.4.2.0 @@ -707,7 +712,7 @@ This package is part of the official TDE bindings module. %defattr(-,root,root,-) %{python_sitearch}/pcop.la %{python_sitearch}/pcop.so -%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/pydcop.py* %if 0%{?rhel} == 7 %{python_sitearch}/__pycache__/pydcop.*.pyc @@ -1084,7 +1089,6 @@ This package contains the development files for the TDE bindings. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%patch -P 0 -p1 %if "%{?perl_vendorarch}" == "" exit 1 @@ -1098,7 +1102,7 @@ exit 2 exit 3 %endif -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 touch config.h.in %endif @@ -1201,6 +1205,12 @@ if grep "LIBPYTHON=''" "config.log"; then exit 1 fi +%if 0%{?mdkversion} && 0%{?pclinuxos} == 0 +# Something weird in openmandriva autotools: +# we need to update generated files timestamps to avoid autotools infinite loop +touch subdirs acinclude.m4 aclocal.m4 Makefile.am Makefile.in Makefile configure config.status +%endif + # Build dcopperl with specific options pushd dcopperl CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=%{tde_mandir}/man3 @@ -1250,6 +1260,13 @@ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/embedjs.desktop" "%{?buildroot}%{tde_tdeappdir}/embedjs.desktop" %__rm -rf "%{?buildroot}%{tde_datadir}/applnk" +# Move dcoppython to %python_sitearch +if [ ! -d "%{?buildroot}%{python_sitearch}" ] && [ -d "%{?buildroot}%{python_sitelib}" ]; then + %__mkdir_p "%{?buildroot}%{python_sitearch}" + %__mv -f "%{?buildroot}%{python_sitelib}/"{pcop.la,pcop.so,pydcop.py} "%{?buildroot}%{python_sitearch}" + rmdir "%{?buildroot}%{python_sitelib}" +fi + # Updates applications categories for openSUSE %if 0%{?suse_version} %suse_update_desktop_file -u kjscmd Development diff --git a/redhat/core/tdeedu/tdeedu.spec b/redhat/core/tdeedu/tdeedu.spec index e0d4cd60a..e2765a442 100644 --- a/redhat/core/tdeedu/tdeedu.spec +++ b/redhat/core/tdeedu/tdeedu.spec @@ -107,7 +107,7 @@ BuildRequires: openssl-devel BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else -%if 0%{?fedora} >= 37 +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 BuildRequires: libusb1-devel BuildRequires: libusb-compat-0.1-devel %else diff --git a/redhat/core/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec index 9a3dd83ec..5a53d06f0 100644 --- a/redhat/core/tdegraphics/tdegraphics.spec +++ b/redhat/core/tdegraphics/tdegraphics.spec @@ -91,7 +91,7 @@ BuildRequires: gamin-devel %endif # LIBUSB support -%if 0%{?fedora} >= 37 +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 BuildRequires: libusb1-devel BuildRequires: libusb-compat-0.1-devel %else @@ -112,11 +112,11 @@ BuildRequires: %{_lib}tiff-devel BuildRequires: libtiff-devel %endif -# PCRE support -%if 0%{?suse_version} -BuildRequires: pcre2-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel %else -BuildRequires: pcre-devel +BuildRequires: pcre2-devel %endif # ACL support @@ -204,30 +204,26 @@ BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel %endif # MESA support -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} -%if "%{?distribution}" == "OpenMandriva Lx" -BuildRequires: %{_lib}glu-devel -%else -BuildRequires: mesaglu-devel +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}mesaglu1-devel %endif +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}glu-devel %endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel -BuildRequires: glu-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-Mesa-libGLU +BuildRequires: Mesa-libGLU-devel %endif # DRM support %if 0%{?rhel} == 4 BuildRequires: xorg-x11-devel %else -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}drm-devel %else BuildRequires: libdrm-devel @@ -235,13 +231,14 @@ BuildRequires: libdrm-devel %endif # OPENEXR support -%if 0%{?mdkver} >= 24090000 +#define with_openexr 1 +%if 0%{?with_openexr} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}openexr-devel -%elif 0%{?suse_version} -BuildRequires: openexr-devel %else BuildRequires: OpenEXR-devel %endif +%endif # POPPLER support %define with_pdf 1 @@ -264,8 +261,8 @@ BuildRequires: trinity-poppler-devel >= 0.12 # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 -%if 0%{?suse_version} -BuildRequires: liblcms2-devel +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel %else BuildRequires: liblcms-devel %endif @@ -279,8 +276,6 @@ BuildRequires: fribidi-devel # OPENSSL support %if 0%{?mdkver} BuildRequires: %{_lib}openssl-devel -%elif 0%{?suse_version} -BuildRequires: libopenssl-3-devel %else BuildRequires: openssl-devel %endif @@ -420,8 +415,10 @@ tags, etc. all from within the file manager). %{tde_tdelibdir}/tdefile_dds.so %{tde_tdelibdir}/tdefile_dvi.la %{tde_tdelibdir}/tdefile_dvi.so +%if 0%{?with_openexr} %{tde_tdelibdir}/tdefile_exr.la %{tde_tdelibdir}/tdefile_exr.so +%endif %{tde_tdelibdir}/tdefile_gif.la %{tde_tdelibdir}/tdefile_gif.so %{tde_tdelibdir}/tdefile_ico.la @@ -456,7 +453,9 @@ tags, etc. all from within the file manager). %{tde_datadir}/services/tdefile_bmp.desktop %{tde_datadir}/services/tdefile_dds.desktop %{tde_datadir}/services/tdefile_dvi.desktop +%if 0%{?with_openexr} %{tde_datadir}/services/tdefile_exr.desktop +%endif %{tde_datadir}/services/tdefile_gif.desktop %{tde_datadir}/services/tdefile_ico.desktop %{tde_datadir}/services/tdefile_jpeg.desktop @@ -1138,7 +1137,7 @@ fi %{?with_t1lib:-DWITH_T1LIB=ON} \ %{?with_paper:-DWITH_LIBPAPER=ON} \ -DWITH_TIFF=ON \ - -DWITH_OPENEXR=ON \ + -DWITH_OPENEXR=%{?with_openexr:ON}%{?!with_openexr:OFF} \ -DWITH_PDF=%{?with_pdf:ON}%{?!with_pdf:OFF} \ -DBUILD_ALL=ON \ -DBUILD_KUICKSHOW=OFF \ diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec index c80d2feec..a7c0c412e 100644 --- a/redhat/core/tdelibs/tdelibs.spec +++ b/redhat/core/tdelibs/tdelibs.spec @@ -76,10 +76,16 @@ PreReq: permissions BuildRequires: libtqt3-mt-devel >= 3.5.0 BuildRequires: tqt3-dev-tools >= 3.5.0 BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63 BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9 +BuildRequires: trinity-filesystem >= %{tde_version} Requires: trinity-arts >= %{tde_epoch}:1.5.10 +Requires: trinity-filesystem >= %{tde_version} +%if 0%{?mgaversion} >= 6 +%else +Requires: fileshareset >= 2.0 +%endif + BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -106,14 +112,14 @@ BuildRequires: libxslt-devel %endif # ALSA support -%if "%{?distribution}" == "OpenMandriva Lx" +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel %endif # IDN support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}idn-devel %else BuildRequires: libidn-devel @@ -123,25 +129,21 @@ BuildRequires: libidn-devel BuildRequires: cups-devel # TIFF support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}tiff-devel %else BuildRequires: libtiff-devel %endif # OPENSSL support -%if 0%{?suse_version} -BuildRequires: libopenssl-3-devel -%else %if 0%{?mdkver} BuildRequires: %{_lib}openssl-devel %else BuildRequires: openssl-devel %endif -%endif # ACL support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}acl-devel %else BuildRequires: libacl-devel @@ -150,11 +152,6 @@ BuildRequires: libacl-devel # GLIB2 support BuildRequires: glib2-devel -%if 0%{?suse_version} -BuildRequires: lzlib-devel -BuildRequires: libwebp-devel -%endif - # LUA support are not ready yet #BuildRequires: lua-devel @@ -167,25 +164,33 @@ BuildRequires: aspell-devel # GAMIN support # Not on openSUSE. -%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %define with_gamin 1 BuildRequires: gamin-devel %endif # PCRE support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if ( 0%{?rhel} >=5 && 0%{?rhel} <= 9 ) || ( 0%{?fedora} && 0%{?fedora} <= 44 ) || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %define with_pcre 1 %if 0%{?mgaversion} >= 9 BuildRequires: %{_lib}pcre-devel -%elif 0%{?suse_version} -BuildRequires: pcre2-devel %else BuildRequires: pcre-devel %endif %endif +# PCRE2 support +%if 0%{?rhel} >=8 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version} +%define with_pcre2 1 +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}pcre2-devel +%else +BuildRequires: pcre2-devel +%endif +%endif + # INOTIFY support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version} %define with_inotify 1 %endif @@ -197,32 +202,36 @@ BuildRequires: bzip2-devel %endif # UTEMPTER support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%define with_utempter 1 BuildRequires: %{_lib}utempter-devel %endif %if 0%{?rhel} >=5 || 0%{?fedora} +%define with_utempter 1 BuildRequires: libutempter-devel %endif %if 0%{?rhel} == 4 +%define with_utempter 1 BuildRequires: utempter %endif -%if 0%{?suse_version} -# Tumbleweed no longer provides utempter; the source supports disabling it. +%if 0%{?suse_version} && 0%{?suse_version} < 1600 +%define with_utempter 1 +BuildRequires: utempter-devel %endif # HSPELL support -%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %define with_hspell 1 BuildRequires: hspell-devel %endif # JASPER support -%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version} %define with_jasper 1 %if 0%{?suse_version} BuildRequires: libjasper-devel %endif -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}jasper-devel %endif %if 0%{?rhel} || 0%{?fedora} @@ -231,10 +240,10 @@ BuildRequires: jasper-devel %endif # AVAHI support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version} %define with_avahi 1 BuildRequires: libavahi-tqt-devel >= 1:0.6.30 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}avahi-client-devel Requires: %{_lib}avahi-client3 %endif @@ -245,13 +254,15 @@ Requires: avahi %endif # OPENEXR support -%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_openexr 1 +#define with_openexr 1 +%if 0%{?with_openexr} +%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version} %if 0%{?mdkver} BuildRequires: %{_lib}openexr-devel %else BuildRequires: OpenEXR-devel %endif +%endif %if 0%{?pclinuxos} BuildRequires: libpthread-stubs @@ -260,7 +271,7 @@ BuildRequires: libpthread-stubs # LIBTOOL BuildRequires: libtool -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}ltdl-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 @@ -268,7 +279,7 @@ BuildRequires: libtool-ltdl-devel %endif # X11 support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: x11-proto-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} @@ -279,13 +290,13 @@ BuildRequires: xorg-x11-devel %endif # ICEAUTH -%if 0%{?fedora} >= 34 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 9 || 0%{?suse_version} >= 1220 +%if 0%{?fedora} >= 34 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 9 || 0%{?suse_version} >= 1220 Requires: iceauth BuildRequires: iceauth %endif # Xorg -%if 0%{?rhel} >= 5 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) +%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) Requires: xorg-x11-server-utils BuildRequires: xorg-x11-server-utils %endif @@ -295,9 +306,9 @@ BuildRequires: xorg-x11 %endif # XZ support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} %define with_lzma 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: %{_lib}lzma-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} @@ -309,15 +320,15 @@ BuildRequires: xz-devel %if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: ca-certificates Requires: ca-certificates -%if 0%{?fedora} >= 20 || 0%{?rhel} >= 6 +%if ( 0%{?fedora} >= 20 && 0%{?fedora} <= 42 ) || 0%{?rhel} >= 6 %define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt %endif %if 0%{?fedora} == 18 || 0%{?fedora} == 19 %define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt %endif %endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver} -%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8 || 0%{?mdkver} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8 || 0%{?mdkver} || 0%{?pclinuxos} Requires: rootcerts %define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt %else @@ -334,18 +345,15 @@ Requires: openssl BuildRequires: ca-certificates Requires: ca-certificates %endif -%if "%{cacert}" != "" && !0%{?suse_version} -Requires: %{cacert} -%endif # XRANDR support # On RHEL5, xrandr library is too old. -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?suse_version} %define with_xrandr 1 %endif # XCOMPOSITE support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %if 0%{?mgaversion} >= 4 %define xcomposite_devel %{_lib}xcomposite-devel %else @@ -361,7 +369,7 @@ Requires: %{cacert} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %define xt_devel libXt-devel %endif -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %define xt_devel %{_lib}xt-devel %endif %{?xt_devel:BuildRequires: %{xt_devel}} @@ -369,7 +377,7 @@ Requires: %{cacert} ### New features in TDE R14 # LIBMAGIC support -%if 0%{?mdkver} +%if 0%{?mdkver} || 0%{?pclinuxos} BuildRequires: %{_lib}magic-devel %else %if 0%{?rhel} != 5 @@ -378,9 +386,9 @@ BuildRequires: file-devel %endif # NETWORKMANAGER support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} %define with_nm 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %if 0%{?mgaversion} && 0%{?mgaversion} <= 7 BuildRequires: %{_lib}nm-util-devel %endif @@ -398,10 +406,14 @@ BuildRequires: NetworkManager-devel %endif # UDEV support -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif @@ -414,12 +426,10 @@ BuildRequires: libudev-devel # UDISKS support %if 0%{?rhel} == 6 -%if 0%{?pclinuxos} == 0 && 0%{?suse_version} <= 1310 %define with_udisks 1 BuildRequires: udisks-devel Requires: udisks %endif -%endif # UDISKS2 support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7 @@ -432,11 +442,11 @@ Requires: udisks %define udisks2 udisks2 %define udisks2_devel libudisks2-0-devel %endif -%if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mgaversion} || 0%{?pclinuxos} %define udisks2 udisks2 %define udisks2_devel udisks2-devel %endif -%if "%{?distribution}" == "OpenMandriva Lx" +%if 0%{?mdkversion} && 0%{?pclinuxos} == 0 %define udisks2 udisks %define udisks2_devel %{_lib}udisks-devel %endif @@ -509,6 +519,12 @@ BuildRequires: %{libattr_devel} # INTLTOOL support BuildRequires: intltool +# WEBP support +%if 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}webp-devel +%else +BuildRequires: libwebp-devel +%endif %description Libraries for the Trinity Desktop Environment: @@ -737,24 +753,18 @@ fi -DWITH_ALSA=ON \ -DWITH_LIBART=ON \ -DWITH_LIBIDN=ON \ + -DWITH_LZIP=OFF \ -DWITH_SSL=ON \ -DWITH_CUPS=ON \ -DWITH_LUA=OFF \ -DWITH_TIFF=ON \ %{?!with_jasper:-DWITH_JASPER=OFF} \ %{?!with_openexr:-DWITH_OPENEXR=OFF} \ - %if 0%{?suse_version} - -DWITH_UTEMPTER=OFF \ - %else - -DWITH_UTEMPTER=ON \ - %endif + %{?!with_utempter:-DWITH_UTEMPTER=OFF} \ %{?!with_avahi:-DWITH_AVAHI=OFF} \ %{?!with_elficon:-DWITH_ELFICON=OFF} \ - %if 0%{?suse_version} - -DWITH_PCRE2=ON \ - %else %{?!with_pcre:-DWITH_PCRE=OFF} \ - %endif + %{?!with_pcre2:-DWITH_PCRE2=OFF} \ %{?!with_inotify:-DWITH_INOTIFY=OFF} \ %{?!with_gamin:-DWITH_GAMIN=OFF} \ %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \ @@ -800,11 +810,6 @@ fi # Symlinks duplicate files (mostly under 'ksgmltools2') %fdupes -s "%{?buildroot}" -# Fix 'tderesources.desktop' (openSUSE only) -%if 0%{?suse_version} -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderesources.desktop Qt X-TDE-settings-desktop -%endif - # Remove setuid bit on some binaries. chmod 0755 "%{?buildroot}%{tde_bindir}/kgrantpty" chmod 0755 "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper" diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec index dac25bc64..069192773 100644 --- a/redhat/core/tdemultimedia/tdemultimedia.spec +++ b/redhat/core/tdemultimedia/tdemultimedia.spec @@ -123,14 +123,26 @@ BuildRequires: zlib-devel #define with_musicbrainz 1 #BuildRequires: libmusicbrainz-devel libtunepimp-devel -# Audio libraries +# AUDIOFILE support +%if 0%{?rhel} >= 10 +%else +%define with_audiofile 1 +%endif +%if 0%{?with_audiofile} BuildRequires: audiofile-devel +%endif + +# Audio libraries BuildRequires: cdparanoia #BuildRequires: libmpg123-devel # VORBIS support %if 0%{?mdkver} || 0%{?mgaversion} +%if 0%{?pclinuxos} +%define libvorbis_devel %{_lib}vorbis0-devel +%else %define libvorbis_devel %{_lib}vorbis-devel +%endif %else %define libvorbis_devel libvorbis-devel %endif @@ -146,7 +158,7 @@ BuildRequires: libtheora-devel # ALSA support %if 0%{?suse_version} BuildRequires: alsa-devel -%elif "%{?distribution}" == "OpenMandriva Lx" +%elif 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}asound-devel %else BuildRequires: alsa-lib-devel @@ -182,7 +194,7 @@ BuildRequires: flac-devel # GSTREAMER support %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}gstreamer-devel BuildRequires: %{_lib}gst-plugins-base1.0-devel %else @@ -225,7 +237,7 @@ BuildRequires: libXxf86vm-devel %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}xine-devel %else BuildRequires: %{_lib}xine1.2-devel @@ -301,7 +313,7 @@ Requires: trinity-kmix = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-krec = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kscd = %{?epoch:%{epoch}:}%{version}-%{release} %{?with_akode:Requires: trinity-libarts-akode = %{?epoch:%{epoch}:}%{version}-%{release}} -Requires: trinity-libarts-audiofile = %{?epoch:%{epoch}:}%{version}-%{release} +%{?with_audiofile:Requires: trinity-libarts-audiofile = %{?epoch:%{epoch}:}%{version}-%{release}} %{?with_mpeg:Requires: trinity-libarts-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}} %{?with_xine:Requires: trinity-libarts-xine = %{?epoch:%{epoch}:}%{version}-%{release}} Requires: trinity-libkcddb = %{?epoch:%{epoch}:}%{version}-%{release} @@ -605,12 +617,12 @@ au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity. %{tde_tdelibdir}/tdefile_m3u.so %{tde_tdelibdir}/tdefile_mp3.la %{tde_tdelibdir}/tdefile_mp3.so +%{tde_tdelibdir}/tdefile_mp4.la +%{tde_tdelibdir}/tdefile_mp4.so %{tde_tdelibdir}/tdefile_mpc.la %{tde_tdelibdir}/tdefile_mpc.so %{tde_tdelibdir}/tdefile_mpeg.la %{tde_tdelibdir}/tdefile_mpeg.so -%{tde_tdelibdir}/tdefile_mp4.la -%{tde_tdelibdir}/tdefile_mp4.so %{tde_tdelibdir}/tdefile_ogg.la %{tde_tdelibdir}/tdefile_ogg.so %{tde_tdelibdir}/tdefile_sid.la @@ -624,9 +636,9 @@ au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity. %{tde_datadir}/services/tdefile_flac.desktop %{tde_datadir}/services/tdefile_m3u.desktop %{tde_datadir}/services/tdefile_mp3.desktop +%{tde_datadir}/services/tdefile_mp4.desktop %{tde_datadir}/services/tdefile_mpc.desktop %{tde_datadir}/services/tdefile_mpeg.desktop -%{tde_datadir}/services/tdefile_mp4.desktop %{tde_datadir}/services/tdefile_ogg.desktop %{tde_datadir}/services/tdefile_sid.desktop %{tde_datadir}/services/tdefile_theora.desktop @@ -837,6 +849,8 @@ This package contains akode plugins for aRts. ########## +%if 0%{?with_audiofile} + %package -n trinity-libarts-audiofile Summary: Audiofile plugin for aRts Group: Productivity/Multimedia/Other @@ -852,6 +866,8 @@ This package contains audiofile plugins for aRts. %{tde_libdir}/mcop/audiofilearts.mcopclass %{tde_libdir}/mcop/audiofilearts.mcoptype +%endif + ########## %if 0%{?with_mpeg} @@ -1070,7 +1086,9 @@ noatun plugins. %if 0%{?with_akode} %{tde_libdir}/libarts_akode.so %endif +%if 0%{?with_audiofile} %{tde_libdir}/libarts_audiofile.so +%endif %if 0%{?with_mpeg} %{tde_libdir}/libarts_mpeglib.so %{tde_libdir}/libarts_mpeglib-0.3.0.so @@ -1165,7 +1183,7 @@ fi -DWITH_ALL_OPTIONS=ON \ -DWITH_ALSA=ON \ -DWITH_ARTS_AKODE=ON \ - -DWITH_ARTS_AUDIOFILE=ON \ + -DWITH_ARTS_AUDIOFILE=%{?with_audiofile:ON}%{!?with_audiofile:OFF} \ -DWITH_ARTS_MPEGLIB=ON \ -DWITH_ARTS_XINE=ON \ -DWITH_CDPARANOIA=ON \ diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec index 8e372bd7c..176441054 100644 --- a/redhat/core/tdenetwork/tdenetwork.spec +++ b/redhat/core/tdenetwork/tdenetwork.spec @@ -120,8 +120,6 @@ Requires: avahi # OPENSSL support %if 0%{?mdkver} BuildRequires: %{_lib}openssl-devel -%elif 0%{?suse_version} -BuildRequires: openssl-devel %else BuildRequires: openssl-devel %endif @@ -140,7 +138,7 @@ BuildRequires: sqlite-devel %endif # GADU support -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || ( 0%{?suse_version} && 0%{?suse_version} < 1600 ) %define with_gadu 1 %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}gadu-devel @@ -149,11 +147,11 @@ BuildRequires: libgadu-devel %endif %endif -# PCRE support -%if 0%{?suse_version} -BuildRequires: pcre2-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel %else -BuildRequires: pcre-devel +BuildRequires: pcre2-devel %endif # GAMIN support @@ -186,7 +184,7 @@ BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel %endif # Other stuff -%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 +%if 0%{?fedora} >= 5 || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) BuildRequires: libXScrnSaver-devel BuildRequires: libXxf86vm-devel %endif @@ -297,6 +295,10 @@ BuildRequires: speex-devel Requires: xinetd %endif +%if 0%{?rhel} >= 10 +BuildRequires: libgcrypt-devel +%endif + # Avoids relinking, which breaks consolehelper %define dont_relink 1 %endif @@ -578,6 +580,7 @@ Summary: Instant messenger for Trinity Group: Applications/Internet Requires: trinity-tdebase-bin >= %{tde_version} Requires: trinity-tdebase-data >= %{tde_version} +Requires: trinity-filesystem >= %{tde_version} %description -n trinity-kopete Kopete is an instant messenger program which can communicate with a variety @@ -821,10 +824,10 @@ Requires: ppp %if 0%{?with_consolehelper} # package 'usermode' provides '/usr/bin/consolehelper-gtk' -%if 0%{?rhel} || 0%{?fedora} +%if ( 0%{?rhel} && 0%{?rhel} <= 9 ) || 0%{?fedora} Requires: usermode-gtk %endif -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 10 Requires: usermode %endif %endif diff --git a/redhat/core/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec index 7dc96a750..581c5f67a 100644 --- a/redhat/core/tdepim/tdepim.spec +++ b/redhat/core/tdepim/tdepim.spec @@ -81,12 +81,14 @@ BuildRequires: tqt3-dev-tools >= 3.5.0 BuildRequires: gpgme-devel BuildRequires: flex BuildRequires: boost-devel -%if 0%{?suse_version} -BuildRequires: pcre2-devel +BuildRequires: libidn-devel + +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel %else -BuildRequires: pcre-devel +BuildRequires: pcre2-devel %endif -BuildRequires: libidn-devel # ICAL support %if 0%{?mdkversion} || 0%{?mgaversion} @@ -103,9 +105,7 @@ BuildRequires: libgpg-error-devel %endif # OPENSSL support -%if 0%{?suse_version} -BuildRequires: libopenssl-3-devel -%elif 0%{?mdkver} +%if 0%{?mdkver} BuildRequires: %{_lib}openssl-devel %else BuildRequires: openssl-devel @@ -153,18 +153,14 @@ BuildRequires: flex-static BuildRequires: bison # CURL support -%if 0%{?suse_version} -BuildRequires: libcurl-devel -%else BuildRequires: curl-devel -%endif # GLIB2 support BuildRequires: glib2-devel # SASL support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}sasl-devel %else BuildRequires: %{_lib}sasl2-devel @@ -191,7 +187,7 @@ BuildRequires: libXcomposite-devel # RHEL 7: available in NUX # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -207,7 +203,7 @@ BuildRequires: xscreensaver-gl-extras %endif %if 0%{?suse_version} -BuildRequires: libXss-devel +BuildRequires: libXScrnSaver-devel BuildRequires: xscreensaver BuildRequires: xscreensaver-data BuildRequires: xscreensaver-data-extra diff --git a/redhat/core/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec index 5c932dc04..e8716463c 100644 --- a/redhat/core/tdesdk/tdesdk.spec +++ b/redhat/core/tdesdk/tdesdk.spec @@ -96,11 +96,11 @@ BuildRequires: libidn-devel BuildRequires: gamin-devel %endif -# PCRE support -%if 0%{?suse_version} -BuildRequires: pcre2-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel %else -BuildRequires: pcre-devel +BuildRequires: pcre2-devel %endif # for kbugbuster/libkcal @@ -122,10 +122,13 @@ BuildRequires: db4-devel BuildRequires: libdb-4_8-devel %endif %endif +%if 0%{?mdkver} +BuildRequires: %{_lib}db5.3-devel +%endif # kbabel, F-7+: flex >= 2.5.33-9 BuildRequires: flex -%if 0%{?mdkver} +%if 0%{?mdkversion} && 0%{?pclinuxos} == 0 BuildRequires: flex-devel %endif # umbrello @@ -154,7 +157,7 @@ BuildRequires: openssl-devel %endif # PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8 || 0%{?suse_version} +%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/core/tdetoys/tdetoys.spec b/redhat/core/tdetoys/tdetoys.spec index 1f927e98d..b0c8a62b2 100644 --- a/redhat/core/tdetoys/tdetoys.spec +++ b/redhat/core/tdetoys/tdetoys.spec @@ -99,11 +99,11 @@ BuildRequires: %{_lib}acl-devel BuildRequires: libacl-devel %endif -# PCRE support -%if 0%{?suse_version} -BuildRequires: pcre2-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel %else -BuildRequires: pcre-devel +BuildRequires: pcre2-devel %endif # OPENSSL support diff --git a/redhat/core/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec index 0272bd8c0..c07db6ac6 100644 --- a/redhat/core/tdeutils/tdeutils.spec +++ b/redhat/core/tdeutils/tdeutils.spec @@ -71,6 +71,7 @@ Provides: trinity-kdeutils-extras = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: tdeutils < %{?epoch:%{epoch}:}%{version}-%{release} Provides: tdeutils = %{?epoch:%{epoch}:}%{version}-%{release} +BuildRequires: trinity-filesystem >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} %if 0%{?suse_version} @@ -129,11 +130,11 @@ BuildRequires: libidn-devel BuildRequires: gamin-devel %endif -# PCRE support -%if 0%{?suse_version} -BuildRequires: pcre2-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel %else -BuildRequires: pcre-devel +BuildRequires: pcre2-devel %endif # XMMS support @@ -157,15 +158,11 @@ BuildRequires: libacl-devel # XSCREENSAVER support # RHEL 8: available in EPEL # RHEL 9: available in EPEL -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} -%if 0%{?suse_version} -BuildRequires: libXss-devel -%else BuildRequires: libXScrnSaver-devel %endif -%endif %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} >= 4 BuildRequires: %{_lib}xscrnsaver-devel @@ -178,8 +175,6 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel # OPENSSL support %if 0%{?mdkver} BuildRequires: %{_lib}openssl-devel -%elif 0%{?suse_version} -BuildRequires: libopenssl-3-devel %else BuildRequires: openssl-devel %endif @@ -347,6 +342,7 @@ This package contains kcharselect, a character set selector for TDE. %package -n trinity-tdelirc Summary: Infrared control for Trinity Group: Applications/Utilities +Requires: trinity-filesystem Obsoletes: trinity-kdelirc < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-kdelirc = %{?epoch:%{epoch}:}%{version}-%{release} @@ -574,10 +570,10 @@ Requires: trinity-kcontrol %if 0%{?with_consolehelper} # package 'usermode' provides '/usr/bin/consolehelper-gtk' -%if 0%{?rhel} || 0%{?fedora} +%if ( 0%{?rhel} && 0%{?rhel} <= 9 ) || 0%{?fedora} Requires: usermode-gtk %endif -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 10 Requires: usermode %endif %endif diff --git a/redhat/core/tdevelop/tdevelop.spec b/redhat/core/tdevelop/tdevelop.spec index 53bf2779a..ea2b2bdd7 100644 --- a/redhat/core/tdevelop/tdevelop.spec +++ b/redhat/core/tdevelop/tdevelop.spec @@ -105,11 +105,11 @@ BuildRequires: libidn-devel BuildRequires: gamin-devel %endif -# PCRE support -%if 0%{?suse_version} -BuildRequires: pcre2-devel +# PCRE2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}pcre2-devel %else -BuildRequires: pcre-devel +BuildRequires: pcre2-devel %endif # DB5 support @@ -141,7 +141,7 @@ BuildRequires: neon-devel # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: lib64ldap-devel %else BuildRequires: openldap-devel @@ -157,7 +157,7 @@ BuildRequires: openldap24-libs-devel # LIBACL support %if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} # ACL support -%if 0%{?mdkver} +%if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}acl-devel %else BuildRequires: libacl-devel diff --git a/redhat/core/tdewebdev/tdewebdev.spec b/redhat/core/tdewebdev/tdewebdev.spec index be13d690d..abea53357 100644 --- a/redhat/core/tdewebdev/tdewebdev.spec +++ b/redhat/core/tdewebdev/tdewebdev.spec @@ -97,17 +97,6 @@ BuildRequires: libgcrypt-devel # PERL support BuildRequires: perl -# KXSLDBG was removed from the current TDE master source tree. -# Keep the legacy package available for other distributions, but do not -# advertise or process it on openSUSE where the source is not present. -%if 0%{?suse_version} -%define build_kxsldbg 0 -%else -%define build_kxsldbg 1 -%endif -BuildRequires: libxml2-devel -#endif - # ICU support %if 0%{?mdkver} BuildRequires: %{_lib}icu-devel @@ -130,7 +119,6 @@ Requires: trinity-quanta-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kimagemapeditor = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-klinkstatus = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release} -%{?build_kxsldbg:Requires: trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release}} %description Web development applications, including: @@ -138,7 +126,6 @@ Web development applications, including: * klinkstatus: link checker * kommander: visual dialog building tool * quanta+: web development -%{?build_kxsldbg:* kxsldbg: xslt Debugger} %files %defattr(-,root,root,-) @@ -153,7 +140,6 @@ Requires: trinity-klinkstatus = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-quanta-data = %{?epoch:%{epoch}:}%{version}-%{release} #Requires: trinity-kimagemapeditor = %{?epoch:%{epoch}:}%{version}-%{release} -#Requires: trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release} Requires: tidy %description -n trinity-quanta @@ -353,53 +339,6 @@ This package is part of TDE, as a component of the TDE web development module. ########## -%if 0%{?build_kxsldbg} - -%package -n trinity-kxsldbg -Summary: graphical XSLT debugger for TDE [Trinity] -Group: Applications/Development - -%description -n trinity-kxsldbg -KXSLDbg is a debugger for XSLT scripts. It includes a graphical user -interface as well as a text-based debugger. KXSLDbg can be run as a -standalone application or as an embedded TDE part. - -XSLT is an XML language for defining transformations of XML files from -XML to some other arbitrary format, such as XML, HTML, plain text, etc., -using standard XSLT stylesheets. - -This package is part of TDE, as a component of the TDE web development module. - -%files -n trinity-kxsldbg -%defattr(-,root,root,-) -%{tde_bindir}/kxsldbg -%{tde_bindir}/xsldbg -%{tde_tdelibdir}/libkxsldbgpart.la -%{tde_tdelibdir}/libkxsldbgpart.so -%{tde_tdeappdir}/kxsldbg.desktop -%{tde_datadir}/applnk/.hidden/xsldbg.desktop -%{tde_datadir}/apps/kxsldbg/ -%{tde_datadir}/apps/kxsldbgpart/ -%{tde_tdedocdir}/HTML/en/kxsldbg/ -%{tde_tdedocdir}/HTML/en/xsldbg/ -%{tde_datadir}/icons/hicolor/*/actions/1downarrow.png -%{tde_datadir}/icons/hicolor/*/actions/configure.png -%{tde_datadir}/icons/hicolor/*/actions/system-log-out.png -%{tde_datadir}/icons/hicolor/*/actions/system-run.png -%{tde_datadir}/icons/hicolor/*/actions/hash.png -%{tde_datadir}/icons/hicolor/*/actions/mark.png -%{tde_datadir}/icons/hicolor/*/actions/next.png -%{tde_datadir}/icons/hicolor/*/actions/step.png -%{tde_datadir}/icons/hicolor/*/actions/xsldbg_*.png -%{tde_datadir}/icons/hicolor/*/apps/kxsldbg.png -%{tde_datadir}/icons/locolor/*/apps/kxsldbg.png -%{tde_datadir}/services/kxsldbg_part.desktop -%{tde_mandir}/man1/kxsldbg.1* - -%endif - -########## - %if 0%{?build_tdefilereplace} %package -n trinity-tdefilereplace @@ -463,10 +402,6 @@ Requires: trinity-kommander-devel = %{?epoch:%{epoch}:}%{version}-%{release} %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1 -a 2 -a 3 -a 4 -%if 0%{?build_kxsldbg} == 0 -%__rm -rf kxsldbg/ doc/kxsldbg/ doc/xsldbg/ -%endif - %build unset QTDIR QTLIB QTINC @@ -480,10 +415,9 @@ fi %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DFORCE_DEBUGGER" \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_INSTALL_RPATH=OFF \ - -DCMAKE_SKIP_INSTALL_RPATH=OFF \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ -- cgit v1.2.3