diff options
Diffstat (limited to 'redhat/core')
28 files changed, 252 insertions, 206 deletions
diff --git a/redhat/core/tde-i18n/tde-i18n.spec b/redhat/core/tde-i18n/tde-i18n.spec index 0ad0405bf..c8d84b8b5 100644 --- a/redhat/core/tde-i18n/tde-i18n.spec +++ b/redhat/core/tde-i18n/tde-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-i18n %define tde_prefix /opt/trinity diff --git a/redhat/core/tdeaccessibility/tdeaccessibility.spec b/redhat/core/tdeaccessibility/tdeaccessibility.spec index a4aa14850..c997fc0c6 100644 --- a/redhat/core/tdeaccessibility/tdeaccessibility.spec +++ b/redhat/core/tdeaccessibility/tdeaccessibility.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeaccessibility %define tde_prefix /opt/trinity @@ -82,7 +82,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 @@ -505,7 +511,7 @@ popd %__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r kmag Utility Accessibility %suse_update_desktop_file kmousetool Utility Accessibility %suse_update_desktop_file kmouth Utility Accessibility diff --git a/redhat/core/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec index 3ace7fea1..7e8b40ad6 100644 --- a/redhat/core/tdeaddons/tdeaddons.spec +++ b/redhat/core/tdeaddons/tdeaddons.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeaddons %define tde_prefix /opt/trinity @@ -777,7 +777,7 @@ export PATH="%{tde_bindir}:${PATH}" # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file atlantikdesigner Game BoardGame %suse_update_desktop_file -r ksig Network Email %endif diff --git a/redhat/core/tdeadmin/tdeadmin.spec b/redhat/core/tdeadmin/tdeadmin.spec index 26dbd84d2..fde9f070d 100644 --- a/redhat/core/tdeadmin/tdeadmin.spec +++ b/redhat/core/tdeadmin/tdeadmin.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeadmin %define tde_prefix /opt/trinity @@ -286,10 +286,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 @@ -465,7 +465,7 @@ done %endif # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kdat System Backup %suse_update_desktop_file kpackage System PackageManager %suse_update_desktop_file kcron System ServiceConfiguration diff --git a/redhat/core/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec index fcd26df2d..4e561a097 100644 --- a/redhat/core/tdeartwork/tdeartwork.spec +++ b/redhat/core/tdeartwork/tdeartwork.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeartwork %define tde_prefix /opt/trinity @@ -110,7 +110,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 @@ -159,9 +159,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.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.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.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/tdebase.spec b/redhat/core/tdebase/tdebase.spec index 1c6265fd0..9e9274e9c 100644 --- a/redhat/core/tdebase/tdebase.spec +++ b/redhat/core/tdebase/tdebase.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdebase %define tde_prefix /opt/trinity @@ -93,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 @@ -130,18 +130,17 @@ BuildRequires: brp-check-trinity # Fedora Theme %if 0%{?fedora} -%if 0%{?fedora} >= 42 -Requires: f41-backgrounds-base -%else -Requires: f%{?fedora}-backgrounds-base -%endif -%if 0%{?fedora} >= 39 -%define tde_bg /usr/share/backgrounds/f%{?fedora}/default/f%{?fedora}-01-day.png -%else -%define tde_bg /usr/share/backgrounds/f%{?fedora}/default/standard/%{?fedora}.png -%endif +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 @@ -175,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 @@ -214,18 +222,10 @@ 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 @@ -251,7 +251,13 @@ 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 0%{?mdkver} >= 5000000 @@ -283,7 +289,7 @@ BuildRequires: %{libvorbis_devel} BuildRequires: glib2-devel # PCRE support -%if 0%{?suse_version} == 0 +%if 0%{?suse_version} == 0 && 0%{?rhel} <= 9 BuildRequires: pcre-devel %endif @@ -314,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 @@ -407,15 +413,16 @@ BuildRequires: hal-devel >= 0.5 %endif # OPENEXR support -# Disabled on RHEL4 +#define with_openexr 1 +%if 0%{?with_openexr} %if 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} >= 5 || 0%{?suse_version} -%define with_exr 1 %if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}openexr-devel %else BuildRequires: OpenEXR-devel %endif %endif +%endif # XSCREENSAVER support # RHEL 4: disabled @@ -424,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%{?pclinuxos} || 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 @@ -516,7 +523,7 @@ BuildRequires: libsmbclient-devel %endif # IMAKE -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 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 @@ -642,11 +649,17 @@ 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 @@ -658,9 +671,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 @@ -1300,10 +1315,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} @@ -1929,7 +1946,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 @@ -2136,7 +2153,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 @@ -2185,9 +2202,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 @@ -2216,7 +2230,7 @@ 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%{?pclinuxos} || 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%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} @@ -2229,11 +2243,6 @@ already. Most users won't need this. %{_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 @@ -2266,16 +2275,11 @@ fi %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 @@ -2291,13 +2295,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 @@ -2313,6 +2319,11 @@ fi %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 @@ -2930,6 +2941,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 @@ -2937,6 +2951,28 @@ 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} || 0%{?pclinuxos} %if 0%{?mdkver} < 5000000 @@ -3261,7 +3297,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"|' @@ -3397,7 +3433,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 \ @@ -3440,7 +3476,7 @@ 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} || 0%{?pclinuxos} +%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 \ @@ -3541,13 +3577,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" @@ -3616,7 +3658,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 fec9320bb..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 entrypoint rename unlink write }; -allow xdm_t tmp_t:fifo_file { getattr open read setattr unlink }; +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.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/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec index 6ee4ee126..d887870d3 100644 --- a/redhat/core/tdebindings/tdebindings.spec +++ b/redhat/core/tdebindings/tdebindings.spec @@ -27,7 +27,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdebindings %define tde_prefix /opt/trinity @@ -246,16 +246,16 @@ 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} >= 42 +%if 0%{?fedora} >= 42 || 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 +%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 @@ -1193,7 +1193,7 @@ if grep "LIBPYTHON=''" "config.log"; then exit 1 fi -%if 0%{?mdkver} +%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 @@ -1256,7 +1256,7 @@ if [ ! -d "%{?buildroot}%{python_sitearch}" ] && [ -d "%{?buildroot}%{python_sit fi # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -u kjscmd Development %suse_update_desktop_file -u embedjs Development %endif diff --git a/redhat/core/tdeedu/tdeedu.spec b/redhat/core/tdeedu/tdeedu.spec index f5f690a6d..bc845b2d0 100644 --- a/redhat/core/tdeedu/tdeedu.spec +++ b/redhat/core/tdeedu/tdeedu.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeedu %define tde_prefix /opt/trinity @@ -102,7 +102,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 @@ -1206,7 +1206,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r khangman Education Languages Game KidsGame %suse_update_desktop_file kiten Education Languages %suse_update_desktop_file klatin Education Languages diff --git a/redhat/core/tdegames/tdegames.spec b/redhat/core/tdegames/tdegames.spec index 7a7a4dbe4..f6945bb0a 100644 --- a/redhat/core/tdegames/tdegames.spec +++ b/redhat/core/tdegames/tdegames.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdegames %define tde_prefix /opt/trinity @@ -1233,7 +1233,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{?buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r kasteroids Game ArcadeGame %suse_update_desktop_file -r KGoldrunner Game ArcadeGame %suse_update_desktop_file -r ksnake Game ArcadeGame diff --git a/redhat/core/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec index 17caa2150..43147a6f6 100644 --- a/redhat/core/tdegraphics/tdegraphics.spec +++ b/redhat/core/tdegraphics/tdegraphics.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdegraphics %define tde_prefix /opt/trinity @@ -87,7 +87,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 @@ -227,11 +227,14 @@ BuildRequires: libdrm-devel %endif # OPENEXR support +#define with_openexr 1 +%if 0%{?with_openexr} %if 0%{?mdkver} >= 5000000 BuildRequires: %{_lib}openexr-devel %else BuildRequires: OpenEXR-devel %endif +%endif # POPPLER support %define with_pdf 1 @@ -254,7 +257,11 @@ BuildRequires: trinity-poppler-devel >= 0.12 # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 +%if 0%{?rhel} >= 10 +BuildRequires: lcms2-devel +%else BuildRequires: liblcms-devel +%endif %else BuildRequires: lcms-devel %endif @@ -404,8 +411,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 @@ -440,7 +449,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 @@ -1122,7 +1133,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 \ @@ -1145,7 +1156,7 @@ for i in {16,32,48,64}; do %__cp $BUILD_ROOT%{tde_datadir}/icons/crystalsvg/"$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}/kpovmodeler.desktop Graphics 3DGraphics %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kolourpaint.desktop Graphics RasterGraphics %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/tdeiconedit.desktop Graphics RasterGraphics diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec index 74595c84b..922481dc8 100644 --- a/redhat/core/tdelibs/tdelibs.spec +++ b/redhat/core/tdelibs/tdelibs.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdelibs %define tde_prefix /opt/trinity @@ -170,7 +170,7 @@ BuildRequires: gamin-devel %endif # PCRE support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if ( 0%{?rhel} >=5 && 0%{?rhel} <= 9 ) || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %define with_pcre 1 %if 0%{?mgaversion} >= 9 BuildRequires: %{_lib}pcre-devel @@ -214,7 +214,7 @@ BuildRequires: libutempter-devel %define with_utempter 1 BuildRequires: utempter %endif -%if 0%{?suse_version} && 0%{?suse_version} < 1699 +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %define with_utempter 1 BuildRequires: utempter-devel %endif @@ -254,13 +254,15 @@ Requires: avahi %endif # OPENEXR support +#define with_openexr 1 +%if 0%{?with_openexr} %if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version} -%define with_openexr 1 %if 0%{?mdkver} BuildRequires: %{_lib}openexr-devel %else BuildRequires: OpenEXR-devel %endif +%endif %if 0%{?pclinuxos} BuildRequires: libpthread-stubs @@ -294,7 +296,7 @@ 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 @@ -318,7 +320,7 @@ 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 @@ -343,7 +345,7 @@ Requires: openssl BuildRequires: ca-certificates Requires: ca-certificates %endif -%if "%{cacert}" != "" +%if "%{?cacert}" != "" Requires: %{cacert} %endif @@ -812,7 +814,7 @@ fi %fdupes -s "%{?buildroot}" # Fix 'tderesources.desktop' (openSUSE only) -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop %endif diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec index 5fd5a7b47..a147eaf52 100644 --- a/redhat/core/tdemultimedia/tdemultimedia.spec +++ b/redhat/core/tdemultimedia/tdemultimedia.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdemultimedia %define tde_prefix /opt/trinity @@ -110,8 +110,16 @@ 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 @@ -290,7 +298,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} @@ -825,6 +833,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 @@ -840,6 +850,8 @@ This package contains audiofile plugins for aRts. %{tde_libdir}/mcop/audiofilearts.mcopclass %{tde_libdir}/mcop/audiofilearts.mcoptype +%endif + ########## %if 0%{?with_mpeg} @@ -1058,7 +1070,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 @@ -1153,7 +1167,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 \ @@ -1193,7 +1207,7 @@ export PATH="%{tde_bindir}:${PATH}" %endif # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file krec AudioVideo Recorder %suse_update_desktop_file tdemid AudioVideo Midi %suse_update_desktop_file artsbuilder AudioVideo AudioVideoEditing diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec index b40e1595c..aff32921c 100644 --- a/redhat/core/tdenetwork/tdenetwork.spec +++ b/redhat/core/tdenetwork/tdenetwork.spec @@ -26,7 +26,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdenetwork %define tde_prefix /opt/trinity @@ -131,7 +131,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 @@ -177,7 +177,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 @@ -288,6 +288,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 @@ -814,10 +818,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 @@ -1235,7 +1239,7 @@ done %endif # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kcmkrfb %suse_update_desktop_file fileshare %suse_update_desktop_file kopete Network InstantMessaging diff --git a/redhat/core/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec index 60153a589..8abd667f1 100644 --- a/redhat/core/tdepim/tdepim.spec +++ b/redhat/core/tdepim/tdepim.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdepim %define tde_prefix /opt/trinity @@ -183,7 +183,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 @@ -1935,7 +1935,7 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{?buildroot} -C build # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/akregator.desktop Network RSS-News %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/groupwarewizard.desktop Utility DesktopSettings X-TDE-Utilities-PIM %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kaddressbook.desktop diff --git a/redhat/core/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec index aab12da8e..6f063b45c 100644 --- a/redhat/core/tdesdk/tdesdk.spec +++ b/redhat/core/tdesdk/tdesdk.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdesdk %define tde_prefix /opt/trinity @@ -1189,7 +1189,7 @@ rm -rf kapptemplate popd # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file kuiviewer Development GUIDesigner %suse_update_desktop_file umbrello Development Design %suse_update_desktop_file kbugbuster Development Debugger diff --git a/redhat/core/tdetoys/tdetoys.spec b/redhat/core/tdetoys/tdetoys.spec index fb358a9da..99ed0f0ee 100644 --- a/redhat/core/tdetoys/tdetoys.spec +++ b/redhat/core/tdetoys/tdetoys.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdetoys %define tde_prefix /opt/trinity @@ -449,7 +449,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -f %{buildroot}%{tde_tdeincludedir}/AmorIface.h # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r kworldclock Utility Clock %suse_update_desktop_file -r kteatime Applet %suse_update_desktop_file -r amor Amusement diff --git a/redhat/core/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec index b54faa8fe..da09173da 100644 --- a/redhat/core/tdeutils/tdeutils.spec +++ b/redhat/core/tdeutils/tdeutils.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdeutils %define tde_prefix /opt/trinity @@ -154,7 +154,7 @@ 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} BuildRequires: libXScrnSaver-devel @@ -566,10 +566,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 @@ -1004,7 +1004,7 @@ if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then fi # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file KEdit Utility TextEditor %if 0%{?build_superkaramba} %suse_update_desktop_file superkaramba Utility DesktopUtility diff --git a/redhat/core/tdevelop/tdevelop.spec b/redhat/core/tdevelop/tdevelop.spec index fabc84a68..664fafbff 100644 --- a/redhat/core/tdevelop/tdevelop.spec +++ b/redhat/core/tdevelop/tdevelop.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdevelop %define tde_prefix /opt/trinity diff --git a/redhat/core/tdewebdev/tdewebdev.spec b/redhat/core/tdewebdev/tdewebdev.spec index a55d0cb36..6dd6b593f 100644 --- a/redhat/core/tdewebdev/tdewebdev.spec +++ b/redhat/core/tdewebdev/tdewebdev.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tdewebdev %define tde_prefix /opt/trinity @@ -97,12 +97,6 @@ BuildRequires: libgcrypt-devel # PERL support BuildRequires: perl -# KXSLDBG requires libxml2 -#if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || ( 0%{?fedora} > 0 && %{?fedora} <= 17 ) || 0%{?suse_version} -%define build_kxsldbg 1 -BuildRequires: libxml2-devel -#endif - # ICU support %if 0%{?mdkver} BuildRequires: %{_lib}icu-devel @@ -125,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: @@ -133,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,-) @@ -148,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 @@ -348,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 @@ -458,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 @@ -527,11 +467,8 @@ done cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/ # Updates applications categories for openSUSE -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file -r klinkstatus Office WebDevelopment -%if 0%{?build_kxsldbg} -%suse_update_desktop_file -r kxsldbg Office WebDevelopment -%endif %suse_update_desktop_file -r kimagemapeditor Office WebDevelopment %suse_update_desktop_file kmdr-editor Development GUIDesigner %suse_update_desktop_file kmdr-executor Development GUIDesigner |