diff options
Diffstat (limited to 'redhat/main')
31 files changed, 368 insertions, 51 deletions
diff --git a/redhat/main/tde-i18n/tde-i18n.spec b/redhat/main/tde-i18n/tde-i18n.spec index c566bc746..7f39132a7 100644 --- a/redhat/main/tde-i18n/tde-i18n.spec +++ b/redhat/main/tde-i18n/tde-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tde-i18n %define tde_prefix /opt/trinity diff --git a/redhat/main/tdeaccessibility/tdeaccessibility.spec b/redhat/main/tdeaccessibility/tdeaccessibility.spec index 474f4cd05..38d70957e 100644 --- a/redhat/main/tdeaccessibility/tdeaccessibility.spec +++ b/redhat/main/tdeaccessibility/tdeaccessibility.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdeaccessibility %define tde_prefix /opt/trinity diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/main/tdeaddons/tdeaddons.spec index a1c13b553..87e0df3f9 100644 --- a/redhat/main/tdeaddons/tdeaddons.spec +++ b/redhat/main/tdeaddons/tdeaddons.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdeaddons %define tde_prefix /opt/trinity @@ -30,6 +30,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde @@ -99,7 +100,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -138,8 +139,9 @@ BuildRequires: db4-devel #%endif # PYTHON2 support -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9 %define with_python 0 +%global __python %__python3 %else %define with_python 1 %if 0%{?rhel} >= 7 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7 @@ -198,6 +200,7 @@ America and Europe. %{tde_tdeappdir}/atlantikdesigner.desktop %{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png %{tde_tdedocdir}/HTML/en/atlantikdesigner/ +%{tde_mandir}/man1/atlantikdesigner.1* ########## @@ -355,6 +358,7 @@ provided for audio and image files. %{tde_datadir}/services/tdefile_txt.desktop %{tde_datadir}/services/renaudiodlg.desktop %{tde_datadir}/services/renimagedlg.desktop +%{tde_mandir}/man1/lnkforward.1* ########## @@ -583,6 +587,10 @@ graphical disk usage viewer and image conversions and transformations. %{tde_tdelibdir}/libadblock.la %{tde_tdelibdir}/libadblock.so %{tde_tdedocdir}/HTML/en/konq-plugins/ +%{tde_mandir}/man1/exif.py.1* +%{tde_mandir}/man1/fsview.1* +%{tde_mandir}/man1/jpegorient.1* +%{tde_mandir}/man1/orient.py.1* ########## @@ -608,6 +616,7 @@ signatures in external mail clients such as KMail. %{tde_datadir}/apps/ksig/ %{tde_datadir}/icons/hicolor/*/apps/ksig.png %{tde_tdedocdir}/HTML/en/ksig/ +%{tde_mandir}/man1/ksig.1* ########## @@ -665,6 +674,9 @@ of user interfaces, playlists and visualisation plugins. %{tde_tdelibdir}/noatunwavecapture.so %{tde_datadir}/apps/noatun/* %{tde_datadir}/icons/crystalsvg/16x16/apps/synaescope.png +%{tde_mandir}/man1/noatunsynaescope.bin.1* +%{tde_mandir}/man1/noatuntippecanoe.bin.1* +%{tde_mandir}/man1/noatuntyler.bin.1* ########## diff --git a/redhat/main/tdeadmin/tdeadmin.spec b/redhat/main/tdeadmin/tdeadmin.spec index 95b46212c..cd5669db0 100644 --- a/redhat/main/tdeadmin/tdeadmin.spec +++ b/redhat/main/tdeadmin/tdeadmin.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdeadmin %define tde_prefix /opt/trinity diff --git a/redhat/main/tdeartwork/tdeartwork.spec b/redhat/main/tdeartwork/tdeartwork.spec index d4cee576c..84be28d21 100644 --- a/redhat/main/tdeartwork/tdeartwork.spec +++ b/redhat/main/tdeartwork/tdeartwork.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdeartwork %define tde_prefix /opt/trinity @@ -31,6 +31,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_sbindir %{tde_prefix}/sbin %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde @@ -104,7 +105,7 @@ BuildRequires: libart_lgpl-devel # RHEL 6: available in EPEL # RHEL 7: available in NUX # RHEL 8: 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} <= 8 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -164,7 +165,7 @@ BuildRequires: %{jack_devel} # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -384,12 +385,34 @@ This package is part of Trinity, and a component of the TDE artwork module. %{tde_datadir}/applnk/System/ScreenSavers/tdepartsaver.desktop %{tde_datadir}/apps/kfiresaver/ %{tde_datadir}/apps/tdescreensaver/ +%{tde_mandir}/man1/kbanner.kss.1* +%{tde_mandir}/man1/kblob.kss.1* +%{tde_mandir}/man1/kclock.kss.1* +%{tde_mandir}/man1/keuphoria.kss.1 +%{tde_mandir}/man1/kfiresaver.kss.1 +%{tde_mandir}/man1/kflux.kss.1 +%{tde_mandir}/man1/kfountain.kss.1 +%{tde_mandir}/man1/kgravity.kss.1 +%{tde_mandir}/man1/klines.kss.1 +%{tde_mandir}/man1/klorenz.kss.1 +%{tde_mandir}/man1/kpendulum.kss.1 +%{tde_mandir}/man1/kpolygon.kss.1 +%{tde_mandir}/man1/krotation.kss.1 +%{tde_mandir}/man1/kscience.kss.1 +%{tde_mandir}/man1/kslideshow.kss.1 +%{tde_mandir}/man1/ksolarwinds.kss.1 +%{tde_mandir}/man1/kvm.kss.1 +%{tde_mandir}/man1/kwave.kss.1 +%{tde_mandir}/man1/tdeasciiquarium.kss.1 +%{tde_mandir}/man1/tdepartsaver.kss.1 %if 0%{?with_xscreensaver} %{tde_bindir}/kspace.kss %{tde_bindir}/kswarm.kss %{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop %{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop +%{tde_mandir}/man1/kspace.kss.1 +%{tde_mandir}/man1/kswarm.kss.1 %endif ########## @@ -515,6 +538,8 @@ This package is part of Trinity, and a component of the TDE artwork module. %{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop %{tde_datadir}/applnk/System/ScreenSavers/worm.desktop %endif +%{tde_mandir}/man1/kxsconfig.1 +%{tde_mandir}/man1/kxsrun.1 %endif @@ -741,7 +766,6 @@ fi -DWITH_ARTS=ON \ -DWITH_LIBART=ON \ -DWITH_OPENGL=ON \ - -DWITH_XSCREENSAVER=ON \ -DBUILD_ALL=ON \ .. diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el9 b/redhat/main/tdebase/pamd.kcheckpass-trinity.el9 new file mode 120000 index 000000000..dab729b22 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.el9 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.el7
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc37 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc37 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc37 @@ -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/main/tdebase/pamd.kdm-trinity-np.el9 b/redhat/main/tdebase/pamd.kdm-trinity-np.el9 new file mode 120000 index 000000000..3415e7d55 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.el9 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.el7
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc37 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc37 new file mode 100644 index 000000000..0616e66f6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc37 @@ -0,0 +1,16 @@ + #%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el9 b/redhat/main/tdebase/pamd.kdm-trinity.el9 new file mode 120000 index 000000000..f85413ec6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.el9 @@ -0,0 +1 @@ +pamd.kdm-trinity.el7
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc37 b/redhat/main/tdebase/pamd.kdm-trinity.fc37 new file mode 100644 index 000000000..4e760760f --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc37 @@ -0,0 +1,23 @@ +#%PAM-1.0 +auth [success=done ignore=ignore default=bad] pam_selinux_permit.so +auth required pam_env.so +auth substack system-auth +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet.so +-auth optional pam_kwallet5.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_selinux.so close +session required pam_loginuid.so +session optional pam_console.so +-session optional pam_ck_connector.so +session required pam_selinux.so open +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet.so +-session optional pam_kwallet5.so +session include postlogin diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el9 b/redhat/main/tdebase/pamd.kscreensaver-trinity.el9 new file mode 120000 index 000000000..a5fab9e3e --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.el9 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.el7
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc37 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc37 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc37 @@ -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/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index f9cc9c23b..86f4c6b88 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdebase %define tde_prefix /opt/trinity @@ -28,6 +28,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde @@ -169,6 +170,14 @@ Requires: redhat-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png %endif +# Rocky 9 Theme +%if 0%{?rocky} == 9 +Requires: rocky-backgrounds +Requires: rocky-logos +%define tde_bg /usr/share/backgrounds/rocky-default-9-abstract-1-day.png +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png +%endif + # Mageia Theme %if 0%{?mgaversion} Requires: mageia-theme-Default @@ -253,8 +262,13 @@ BuildRequires: pam-devel BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else +%if 0%{?fedora} >= 37 +BuildRequires: libusb1-devel +BuildRequires: libusb-compat-0.1-devel +%else BuildRequires: libusb-devel %endif +%endif # ESOUND support %if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} @@ -267,7 +281,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?rhel} && 0%{?rhel} <= 8 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -337,7 +351,7 @@ BuildRequires: OpenEXR-devel # RHEL 6: available in EPEL # RHEL 7: available in NUX # RHEL 8: 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} <= 8 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -492,12 +506,15 @@ BuildRequires: x11-proto-devel BuildRequires: xorg-x11-proto-devel %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} +%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?fedora} BuildRequires: xorg-x11-font-utils %endif %if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34 BuildRequires: font-util +%endif + +%if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34 || 0%{?rhel} >= 9 BuildRequires: bdftopcf %endif @@ -548,6 +565,16 @@ BuildRequires: checkpolicy BuildRequires: selinux-policy-devel %endif +# LIBSSH support +%if 0%{?rhel} == 6 +%define with_libssh 0 +%else +%define with_libssh 1 +%endif +%if 0%{?with_libssh} +BuildRequires: libssh-devel +%endif + # tdebase is a metapackage that installs all sub-packages Requires: %{name}-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} @@ -736,6 +763,7 @@ creates menu entries for them. %{tde_datadir}/applnk/System/kappfinder.desktop %{tde_datadir}/apps/kappfinder %{tde_datadir}/icons/hicolor/*/apps/kappfinder.png +%{tde_mandir}/man1/kappfinder.1* ########## @@ -794,6 +822,7 @@ Some random features: %{tde_datadir}/icons/hicolor/*/apps/kate2.svgz %{tde_datadir}/servicetypes/kateplugin.desktop %{tde_tdedocdir}/HTML/en/kate/ +%{tde_mandir}/man1/kate.1* ########## @@ -836,7 +865,7 @@ Kwrite is an advanced text editor for TDE. %{tde_datadir}/icons/hicolor/*/apps/kwrite.png %{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz %{tde_tdedocdir}/HTML/en/kwrite/ - +%{tde_mandir}/man1/kwrite.1* ########## @@ -1262,6 +1291,22 @@ TDE applications, particularly those in the TDE base module. %{tde_tdedocdir}/HTML/en/tdesu/ %{tde_tdedocdir}/HTML/en/knetattach/ %{tde_tdedocdir}/HTML/en/kxkb/ +%{tde_mandir}/man1/drkonqi.1* +%{tde_mandir}/man1/kblankscrn.kss.1* +%{tde_mandir}/man1/kcheckpass.1* +%{tde_mandir}/man1/kcminit.1* +%{tde_mandir}/man1/kdcop.1* +%{tde_mandir}/man1/kdialog.1* +%{tde_mandir}/man1/khotkeys.1* +%{tde_mandir}/man1/knetattach.1* +%{tde_mandir}/man1/krandom.kss.1* +%{tde_mandir}/man1/kreadconfig.1* +%{tde_mandir}/man1/kstart.1* +%{tde_mandir}/man1/ksystraycmd.1* +%{tde_mandir}/man1/kwriteconfig.1* +%{tde_mandir}/man1/kxkb.1* +%{tde_mandir}/man1/tdedebugdialog.1* +%{tde_mandir}/man1/tdesu.1* # SETUID binaries # Some setuid binaries need special care @@ -1701,8 +1746,10 @@ group. %{tde_tdelibdir}/tdeio_remote.so %{tde_tdelibdir}/tdeio_settings.la %{tde_tdelibdir}/tdeio_settings.so +%if 0%{?with_libssh} %{tde_tdelibdir}/tdeio_sftp.la %{tde_tdelibdir}/tdeio_sftp.so +%endif %{tde_tdelibdir}/tdeio_system.la %{tde_tdelibdir}/tdeio_system.so %{tde_tdelibdir}/tdeio_tar.la @@ -1758,7 +1805,9 @@ group. %{tde_datadir}/services/programs.protocol %{tde_datadir}/services/remote.protocol %{tde_datadir}/services/settings.protocol +%if 0%{?with_libssh} %{tde_datadir}/services/sftp.protocol +%endif %{tde_datadir}/services/system.protocol %{tde_datadir}/services/tar.protocol %{tde_datadir}/services/textthumbnail.desktop @@ -1769,6 +1818,9 @@ group. %{tde_datadir}/servicetypes/thumbcreator.desktop %{tde_datadir}/services/tdefile_trash.desktop %{tde_tdedocdir}/HTML/en/tdeioslave/ +%{tde_mandir}/man1/ktrash.1* +%{tde_mandir}/man1/tdeio_media_mounthelper.1* +%{tde_mandir}/man1/tdeio_system_documenthelper.1* %if 0%{?with_exr} %{tde_tdelibdir}/exrthumbnail.la @@ -1838,6 +1890,7 @@ system passwords. %{_datadir}/faces/Star.png %{_datadir}/faces/Teddybear.png %{_datadir}/faces/Turtle.png +%{tde_mandir}/man1/tdepasswd.1* ########## @@ -1900,6 +1953,9 @@ Installation of smbclient will make you able to use smb shared printers. %{tde_tdedocdir}/HTML/en/tdeprint/ %{tde_tdedocdir}/HTML/en/tdeprintfax/ %{tde_tdedocdir}/HTML/en/kjobviewer/ +%{tde_mandir}/man1/kjobviewer.1* +%{tde_mandir}/man1/kprinter.1* +%{tde_mandir}/man1/tdeprintfax.1* ########## @@ -2032,6 +2088,12 @@ already. Most users won't need this. %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np %endif +%{tde_mandir}/man1/gentdmconf.1* +%{tde_mandir}/man1/krootimage.1* +%{tde_mandir}/man1/tdm.1* +%{tde_mandir}/man1/tdmctl.1* +%{tde_mandir}/man1/tdm_config.1* +%{tde_mandir}/man1/tdm_greet.1* %if "%{?tde_version}" == "14.1.0" %{tde_bindir}/tdecryptocardwatcher @@ -2193,6 +2255,7 @@ workstations. %{tde_datadir}/services/kfindpart.desktop %{tde_datadir}/servicetypes/findpart.desktop %{tde_tdedocdir}/HTML/en/kfind/ +%{tde_mandir}/man1/kfind.1* ########## @@ -2342,6 +2405,10 @@ functionality. %if 0%{?mgaversion} >= 3 %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg %endif +%{tde_mandir}/man1/appletproxy.1* +%{tde_mandir}/man1/extensionproxy.1* +%{tde_mandir}/man1/kasbar.1* +%{tde_mandir}/man1/kicker.1* ########## @@ -2430,6 +2497,7 @@ structure. %{tde_datadir}/apps/kcontroledit/ %{tde_datadir}/apps/kmenuedit/ %{tde_tdedocdir}/HTML/en/kmenuedit/ +%{tde_mandir}/man1/kmenuedit.1* ########## @@ -2562,6 +2630,9 @@ ever launching another application. %{tde_datadir}/servicetypes/konqaboutpage.desktop %{tde_tdedocdir}/HTML/en/konqueror/ %{tde_tdedocdir}/HTML/en/keditbookmarks/ +%{tde_mandir}/man1/keditbookmarks.1* +%{tde_mandir}/man1/kfmclient.1* +%{tde_mandir}/man1/konqueror.1* %post -n trinity-konqueror if [ $1 -eq 1 ]; then @@ -2669,6 +2740,7 @@ Using Konsole, a user can open: %{tde_tdedocdir}/HTML/en/konsole/ %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/ %config %{_sysconfdir}/fonts/conf.d/99-konsole.conf +%{tde_mandir}/man1/konsole.1* ########## @@ -2689,6 +2761,7 @@ applications. It is used to switch between applications or desktops. %{tde_datadir}/applnk/Utilities/kpager.desktop %{tde_datadir}/icons/hicolor/*/apps/kpager.png %{tde_tdedocdir}/HTML/en/kpager/ +%{tde_mandir}/man1/kpager.1* ########## @@ -2710,6 +2783,7 @@ automatically started. KPersonalizer can also be called later. %{tde_datadir}/applnk/System/kpersonalizer.desktop %{tde_datadir}/apps/kpersonalizer/ %{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png +%{tde_mandir}/man1/kpersonalizer.1* ########## @@ -2747,6 +2821,7 @@ TDE will start, but many good defaults will not be set. %{tde_datadir}/apps/tdeconf_update/ksmserver.upd %{tde_datadir}/apps/tdeconf_update/move_session_config.sh %{tde_datadir}/apps/ksmserver/ +%{tde_mandir}/man1/starttde.1* %post -n trinity-ksmserver %if 0%{?mdkversion} || 0%{?mgaversion} diff --git a/redhat/main/tdebase/tdm.el9.te b/redhat/main/tdebase/tdm.el9.te new file mode 120000 index 000000000..034e33247 --- /dev/null +++ b/redhat/main/tdebase/tdm.el9.te @@ -0,0 +1 @@ +tdm.el8.te
\ No newline at end of file diff --git a/redhat/main/tdebase/tdm.fc37.te b/redhat/main/tdebase/tdm.fc37.te new file mode 100644 index 000000000..afe6de52a --- /dev/null +++ b/redhat/main/tdebase/tdm.fc37.te @@ -0,0 +1,11 @@ + +module tdm 1.0; + +require { + type fprintd_t; + type init_t; + class dbus send_msg; +} + +#============= fprintd_t ============== +allow fprintd_t init_t:dbus send_msg; diff --git a/redhat/main/tdebase/tdm.service.el9 b/redhat/main/tdebase/tdm.service.el9 new file mode 120000 index 000000000..87f56ea08 --- /dev/null +++ b/redhat/main/tdebase/tdm.service.el9 @@ -0,0 +1 @@ +tdm.service.el7
\ No newline at end of file diff --git a/redhat/main/tdebase/tdm.service.fc37 b/redhat/main/tdebase/tdm.service.fc37 new file mode 100644 index 000000000..9ef7e07ff --- /dev/null +++ b/redhat/main/tdebase/tdm.service.fc37 @@ -0,0 +1,12 @@ +[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/main/tdebindings/tdebindings.spec b/redhat/main/tdebindings/tdebindings.spec index 17287c002..d0fe72ad7 100644 --- a/redhat/main/tdebindings/tdebindings.spec +++ b/redhat/main/tdebindings/tdebindings.spec @@ -27,7 +27,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdebindings %define tde_prefix /opt/trinity @@ -169,8 +169,9 @@ BuildRequires: Mesa-libGLU-devel %endif # PYTHON support -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9 %define with_python 0 +%global __python %__python3 %else %define with_python 1 %if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 7 @@ -373,6 +374,7 @@ This package is part of the official TDE bindings module. %files -n trinity-libdcop3-java-devel %defattr(-,root,root,-) %{tde_bindir}/dcopidl2java +%{tde_mandir}/man1/dcopidl2java.1* %endif @@ -806,6 +808,7 @@ This package is part of the official TDE bindings module. %defattr(-,root,root,-) %{tde_bindir}/juic %{tde_datadir}/juic/ +%{tde_mandir}/man1/juic.1* %endif ########## @@ -836,6 +839,9 @@ This package is part of the official TDE bindings module. %{ruby_arch}/korundum.la %{ruby_arch}/korundum.so* %doc korundum/ChangeLog +%{tde_mandir}/man1/krubyinit.1* +%{tde_mandir}/man1/rbtdeapi.1* +%{tde_mandir}/man1/rbtdesh.1* ########## @@ -867,6 +873,10 @@ This package is part of the official TDE bindings module. %{ruby_arch}/tqui.so* %{ruby_arch}/tqui.la %doc qtruby/ChangeLog +%{tde_mandir}/man1/qtrubyinit.1* +%{tde_mandir}/man1/rbqtapi.1* +%{tde_mandir}/man1/rbqtsh.1* +%{tde_mandir}/man1/rbuic.1* ########## diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec index ea4825d4e..33cbe2e9e 100644 --- a/redhat/main/tdeedu/tdeedu.spec +++ b/redhat/main/tdeedu/tdeedu.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdeedu %define tde_prefix /opt/trinity @@ -94,8 +94,13 @@ BuildRequires: openssl-devel BuildRequires: %{_lib}usb1.0-devel BuildRequires: %{_lib}usb-compat0.1-devel %else +%if 0%{?fedora} >= 37 +BuildRequires: libusb1-devel +BuildRequires: libusb-compat-0.1-devel +%else BuildRequires: libusb-devel %endif +%endif # PYTHON3 support %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 || 0%{?mgaversion} >= 8 diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec index e1f51f8b4..c8799b131 100644 --- a/redhat/main/tdegames/tdegames.spec +++ b/redhat/main/tdegames/tdegames.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdegames %define tde_prefix /opt/trinity @@ -91,7 +91,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/main/tdegraphics/tdegraphics.spec b/redhat/main/tdegraphics/tdegraphics.spec index c377748b1..623855117 100644 --- a/redhat/main/tdegraphics/tdegraphics.spec +++ b/redhat/main/tdegraphics/tdegraphics.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdegraphics %define tde_prefix /opt/trinity @@ -28,6 +28,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde @@ -80,13 +81,18 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif # LIBUSB support -BuildRequires: libusb-devel +%if 0%{?fedora} >= 37 +BuildRequires: libusb1-devel +BuildRequires: libusb-compat-0.1-devel +%else +BuildRequires: libusb-devel +%endif # MNG support BuildRequires: libmng-devel @@ -339,6 +345,8 @@ picker. %{tde_datadir}/icons/hicolor/*/apps/kcolorchooser.png %{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png %{tde_tdedocdir}/HTML/en/kcoloredit/ +%{tde_mandir}/man1/kcolorchooser.1* +%{tde_mandir}/man1/kcoloredit.1* ########## @@ -435,6 +443,7 @@ This program and KPart allow the user to display *.DVI files from TeX. %{tde_datadir}/icons/hicolor/scalable/apps/kdvi.svgz %{tde_datadir}/services/kdvimultipage.desktop %{tde_tdedocdir}/HTML/en/kdvi/ +%{tde_mandir}/man1/kdvi.1* ########## @@ -454,6 +463,7 @@ A fax viewer for Trinity, supporting the display of raw and tiffed fax images %{tde_datadir}/icons/hicolor/??x??/apps/kfax.png %{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz %{tde_tdedocdir}/HTML/en/kfax/ +%{tde_mandir}/man1/kfax.1* ########## @@ -480,6 +490,7 @@ kfax application once it reproduces all of kfax's features. %{tde_datadir}/services/kfaxmultipage.desktop %{tde_datadir}/services/kfaxmultipage_tiff.desktop %{tde_tdedocdir}/HTML/en/kfaxview/ +%{tde_mandir}/man1/kfaxview.1* ########## @@ -533,6 +544,7 @@ online. %{tde_datadir}/icons/hicolor/*/apps/kghostview.png %{tde_datadir}/services/kghostview_part.desktop %{tde_tdedocdir}/HTML/en/kghostview/ +%{tde_mandir}/man1/kghostview.1* ########## @@ -553,6 +565,7 @@ TDEIconedit allows you easily to create and edit icons. %{tde_datadir}/apps/tdeiconedit/ %{tde_datadir}/icons/hicolor/*/apps/tdeiconedit.png %{tde_tdedocdir}/HTML/en/tdeiconedit/ +%{tde_mandir}/man1/tdeiconedit.1* ########## @@ -620,6 +633,7 @@ Homepage: http://kolourpaint.sourceforge.net %{tde_datadir}/icons/hicolor/*/apps/kolourpaint.png %{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz %{tde_tdedocdir}/HTML/en/kolourpaint/ +%{tde_mandir}/man1/kolourpaint.1* ########## @@ -650,6 +664,7 @@ Homepage: http://kooka.kde.org/ %config(noreplace) %{tde_confdir}/kookarc %{tde_datadir}/icons/hicolor/*/apps/kooka.png %{tde_tdedocdir}/HTML/en/kooka/ +%{tde_mandir}/man1/kooka.1* ########## @@ -675,6 +690,7 @@ application. %{tde_datadir}/icons/hicolor/*/apps/kpdf.png %{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz %{tde_datadir}/services/kpdf_part.desktop +%{tde_mandir}/man1/kpdf.1* ########## @@ -708,6 +724,7 @@ Homepage: http://www.kpovmodeler.org %{tde_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* %{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.* %doc %{tde_tdedocdir}/HTML/en/kpovmodeler/ +%{tde_mandir}/man1/kpovmodeler.1* ########## @@ -726,6 +743,7 @@ Kruler is a screen ruler (using pixels) and color measurement tool for KDE. %{tde_datadir}/apps/kruler/ %{tde_datadir}/icons/hicolor/*/apps/kruler.png %{tde_tdedocdir}/HTML/en/kruler/ +%{tde_mandir}/man1/kruler.1* ########## @@ -745,6 +763,7 @@ The images can then be saved in a variety of formats. %{tde_datadir}/icons/hicolor/*/apps/ksnapshot.png %{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz %{tde_tdedocdir}/HTML/en/ksnapshot/ +%{tde_mandir}/man1/ksnapshot.1* ########## @@ -832,6 +851,7 @@ as well. %{tde_datadir}/servicetypes/kimageviewer.desktop %{tde_datadir}/servicetypes/kimageviewercanvas.desktop %{tde_tdedocdir}/HTML/en/kview/ +%{tde_mandir}/man1/kview.1* ########## @@ -868,6 +888,7 @@ DjVu images. %{tde_datadir}/services/emptymultipage.desktop %{tde_datadir}/services/djvumultipage.desktop %{tde_datadir}/servicetypes/tdemultipage.desktop +%{tde_mandir}/man1/kviewshell.1* ########## diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec index 603c778a0..501b7e9ae 100644 --- a/redhat/main/tdelibs/tdelibs.spec +++ b/redhat/main/tdelibs/tdelibs.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdelibs %define tde_prefix /opt/trinity @@ -140,7 +140,7 @@ BuildRequires: aspell-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/main/tdemultimedia/tdemultimedia.spec b/redhat/main/tdemultimedia/tdemultimedia.spec index f5506e0aa..2f1f338fe 100644 --- a/redhat/main/tdemultimedia/tdemultimedia.spec +++ b/redhat/main/tdemultimedia/tdemultimedia.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdemultimedia %define tde_prefix /opt/trinity @@ -31,6 +31,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde @@ -459,6 +460,7 @@ Some of JuK's features include: %{tde_datadir}/icons/crystalsvg/*/actions/juk_dock.png %{tde_datadir}/icons/hicolor/*/apps/juk.png %{tde_tdedocdir}/HTML/en/juk/ +%{tde_mandir}/man1/juk.1* ########## @@ -485,6 +487,7 @@ for TDE. It uses the aRts framework for playing media files. %{tde_datadir}/services/kaboodle_component.desktop %{tde_datadir}/services/kaboodleengine.desktop %{tde_tdedocdir}/HTML/en/kaboodle/ +%{tde_mandir}/man1/kaboodle.1* ########## @@ -515,6 +518,7 @@ searches CDDB to retrieve the information of the disk. %{tde_datadir}/icons/hicolor/*/apps/kaudiocreator.png %{tde_datadir}/icons/locolor/*/apps/kaudiocreator.png %{tde_tdedocdir}/HTML/en/kaudiocreator/ +%{tde_mandir}/man1/kaudiocreator.1* ########## @@ -672,6 +676,8 @@ This package includes TDE's dockable sound mixer applet. %{tde_datadir}/icons/hicolor/*/apps/kmix.png %{tde_datadir}/services/kmixctrl_restore.desktop %{tde_tdedocdir}/HTML/en/kmix/ +%{tde_mandir}/man1/kmix.1* +%{tde_mandir}/man1/kmixctrl.1* ########## @@ -710,6 +716,7 @@ This is a sound recording utility for Trinity. %{tde_datadir}/services/krec_exportwave.desktop %{tde_datadir}/servicetypes/krec_exportitem.desktop %{tde_tdedocdir}/HTML/en/krec/ +%{tde_mandir}/man1/krec.1* ########## @@ -968,6 +975,7 @@ formats supported by your installation of aRts (including aRts plugins). %{tde_datadir}/icons/hicolor/*/apps/noatun.png %{tde_datadir}/mimelnk/interface/x-winamp-skin.desktop %{tde_tdedocdir}/HTML/en/noatun/ +%{tde_mandir}/man1/noatun.1* ########## diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec index e53f73de7..9a0c44a16 100644 --- a/redhat/main/tdenetwork/tdenetwork.spec +++ b/redhat/main/tdenetwork/tdenetwork.spec @@ -26,7 +26,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdenetwork %define tde_prefix /opt/trinity @@ -137,7 +137,7 @@ BuildRequires: pcre-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -252,6 +252,14 @@ BuildRequires: speex-devel %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_consolehelper 1 +# XINETD support +%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 +# No xinetd +%else +%define with_xinetd 1 +Requires: xinetd +%endif + # Avoids relinking, which breaks consolehelper %define dont_relink 1 %endif @@ -433,6 +441,7 @@ basic as well as advanced queries. %{tde_datadir}/apps/kicker/applets/kdictapplet.desktop %{tde_datadir}/icons/hicolor/*/apps/kdict.* %{tde_tdedocdir}/HTML/en/kdict +%{tde_mandir}/man1/kdict.1* ########## @@ -492,6 +501,7 @@ applications and Netscape. %{tde_datadir}/sounds/KGet_Finished_All.ogg %{tde_datadir}/sounds/KGet_Started.ogg %{tde_tdedocdir}/HTML/en/kget +%{tde_mandir}/man1/kget.1* ########## @@ -721,6 +731,7 @@ Support for more IM protocols can be added through a plugin system. %{tde_libdir}/libkopete_msn_shared.so.0 %{tde_libdir}/libkopete_msn_shared.so.0.0.0 %endif +%{tde_mandir}/man1/kopete.1* ########## @@ -918,7 +929,7 @@ Summary: Talk daemon for Trinity Group: Applications/Internet Requires: trinity-kcontrol >= %{tde_version} Requires: trinity-tdebase-data >= %{tde_version} -%if 0%{?fedora} == 0 || 0%{?fedora} <= 33 +%if 0%{?with_xinetd} Requires: xinetd %endif @@ -938,10 +949,10 @@ and shouldn't be run on a multi-user machine. %{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png %{tde_datadir}/icons/hicolor/*/apps/ktalkd.png %{tde_datadir}/sounds/ktalkd.wav -%if 0%{?fedora} == 0 || 0%{?fedora} <= 30 +%if 0%{?with_xinetd} %dir %{_sysconfdir}/xinetd.d -%endif %config(noreplace) %{_sysconfdir}/xinetd.d/ktalk +%endif %{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd %{tde_tdedocdir}/HTML/en/ktalkd @@ -974,6 +985,7 @@ wavelan card that uses the wireless extensions interface. %{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz %{tde_tdedocdir}/HTML/en/kwifimanager/ %{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/ +%{tde_mandir}/man1/kwifimanager.1* %endif @@ -1024,6 +1036,8 @@ but relying only on the TCP/IP protocol. %{tde_datadir}/services/rlan.protocol %{tde_bindir}/lisa %{tde_bindir}/reslisa +%{tde_mandir}/man8/lisa.8* +%{tde_mandir}/man8/reslisa.8* ########## @@ -1168,8 +1182,10 @@ if [ -r "%{?buildroot}%{tde_bindir}/kppp" ]; then chmod 0755 "%{?buildroot}%{tde_bindir}/kppp" fi +%if 0%{?with_xinetd} # ktalk %__install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk +%endif # Avoids conflict with trinity-kvirc %__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/ diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec index 689445c5b..683e79837 100644 --- a/redhat/main/tdepim/tdepim.spec +++ b/redhat/main/tdepim/tdepim.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdepim %define tde_prefix /opt/trinity @@ -97,7 +97,7 @@ BuildRequires: brp-check-trinity # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -149,7 +149,7 @@ BuildRequires: libXcomposite-devel # RHEL 6: available in EPEL # RHEL 7: available in NUX # RHEL 8: 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} <= 8 ) || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 diff --git a/redhat/main/tdesdk/tdesdk.spec b/redhat/main/tdesdk/tdesdk.spec index 17e4a441b..aa4454eb6 100644 --- a/redhat/main/tdesdk/tdesdk.spec +++ b/redhat/main/tdesdk/tdesdk.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdesdk %define tde_prefix /opt/trinity @@ -87,7 +87,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -253,6 +253,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %defattr(-,root,root,-) %{tde_bindir}/kapptemplate %{tde_datadir}/apps/kapptemplate/ +%{tde_mandir}/man1/kapptemplate.1* %pre -n trinity-kapptemplate if [ -d "%{tde_bindir}/kapptemplate" ]; then @@ -378,6 +379,9 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/servicetypes/kbabel_validator.desktop %{tde_datadir}/servicetypes/kbabeldict_module.desktop %{tde_datadir}/servicetypes/kbabelfilter.desktop +%{tde_mandir}/man1/catalogmanager.1* +%{tde_mandir}/man1/kbabel.1* +%{tde_mandir}/man1/kbabeldict.1* ########## @@ -434,6 +438,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/icons/locolor/*/apps/kbugbuster.png %{tde_datadir}/services/tderesources/kcal/bugzilla.desktop %{tde_tdedocdir}/HTML/en/kbugbuster/ +%{tde_mandir}/man1/kbugbuster.1* ########## @@ -461,6 +466,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/icons/hicolor/*/apps/tdecachegrind.png %{tde_datadir}/mimelnk/application/x-tdecachegrind.desktop %{tde_tdedocdir}/HTML/en/tdecachegrind/ +%{tde_mandir}/man1/tdecachegrind.1* ########## @@ -492,6 +498,11 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_bindir}/memprof2calltree %{tde_bindir}/op2calltree %{tde_bindir}/pprof2calltree +%{tde_mandir}/man1/dprof2calltree.1* +%{tde_mandir}/man1/hotshot2calltree.1* +%{tde_mandir}/man1/memprof2calltree.1* +%{tde_mandir}/man1/op2calltree.1* +%{tde_mandir}/man1/pprof2calltree.1* ########## @@ -626,13 +637,46 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_bindir}/svnchangesince %{tde_bindir}/svn-clean %{tde_datadir}/apps/katepart/syntax/tdesvn-buildrc.xml -%{tde_mandir}/man1/cvsblame.1 -%{tde_mandir}/man1/cvscheck.1 -%{tde_mandir}/man1/cvsversion.1 -%{tde_mandir}/man1/kde-build.1 -%{tde_mandir}/man1/includemocs.1 -%{tde_mandir}/man1/noncvslist.1 -%{tde_mandir}/man1/tdesvn-build.1 +%{tde_mandir}/man1/adddebug.1* +%{tde_mandir}/man1/build-progress.sh.1* +%{tde_mandir}/man1/cheatmake.1* +%{tde_mandir}/man1/create_cvsignore.1* +%{tde_mandir}/man1/create_makefile.1* +%{tde_mandir}/man1/create_makefiles.1* +%{tde_mandir}/man1/cvsblame.1* +%{tde_mandir}/man1/cvscheck.1* +%{tde_mandir}/man1/cvs-clean.1* +%{tde_mandir}/man1/cvs2dist.1* +%{tde_mandir}/man1/cvsaskpass.1* +%{tde_mandir}/man1/cvsbackport.1* +%{tde_mandir}/man1/cvsforwardport.1* +%{tde_mandir}/man1/cvslastchange.1* +%{tde_mandir}/man1/cvslastlog.1* +%{tde_mandir}/man1/cvsrevertlast.1* +%{tde_mandir}/man1/cvsservice.1* +%{tde_mandir}/man1/cvsversion.1* +%{tde_mandir}/man1/cxxmetric.1* +%{tde_mandir}/man1/extend_dmalloc.1* +%{tde_mandir}/man1/extractattr.1* +%{tde_mandir}/man1/extractrc.1* +%{tde_mandir}/man1/findmissingcrystal.1* +%{tde_mandir}/man1/fixkdeincludes.1* +%{tde_mandir}/man1/fixuifiles.1* +%{tde_mandir}/man1/includemocs.1* +%{tde_mandir}/man1/kde-build.1* +%{tde_mandir}/man1/kdedoc.1* +%{tde_mandir}/man1/kdelnk2desktop.py.1* +%{tde_mandir}/man1/kdemangen.pl.1* +%{tde_mandir}/man1/licensecheck.1* +%{tde_mandir}/man1/noncvslist.1* +%{tde_mandir}/man1/makeobj.1* +%{tde_mandir}/man1/package_crystalsvg.1* +%{tde_mandir}/man1/png2mng.pl.1 +%{tde_mandir}/man1/pruneemptydirs.1 +%{tde_mandir}/man1/qtdoc.1* +%{tde_mandir}/man1/tdekillall.1* +%{tde_mandir}/man1/tdesvn-build.1* +%{tde_mandir}/man1/zonetab2pot.py.1* %{tde_tdedocdir}/HTML/en/tdesvn-build/ #scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts #scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts @@ -673,6 +717,10 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_libdir}/kmtrace/libktrace.la %{tde_libdir}/kmtrace/libktrace.so %{tde_datadir}/apps/kmtrace/ +%{tde_mandir}/man1/demangle.1* +%{tde_mandir}/man1/kminspector.1* +%{tde_mandir}/man1/kmmatch.1* +%{tde_mandir}/man1/kmtrace.1* ########## @@ -705,6 +753,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/icons/hicolor/*/apps/kompare.png %{tde_datadir}/icons/hicolor/scalable/apps/kompare.svgz %{tde_tdedocdir}/HTML/en/kompare/ +%{tde_mandir}/man1/kompare.1* ########## @@ -729,6 +778,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %defattr(-,root,root,-) %{tde_libdir}/libkspy.la %{tde_libdir}/libkspy.so.* +%{tde_mandir}/man1/testkspy.1* ########## @@ -760,6 +810,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/services/designerthumbnail.desktop %{tde_datadir}/services/kuiviewer_part.desktop %{tde_tdedocdir}/HTML/en/kuiviewer/ +%{tde_mandir}/man1/kuiviewer.1* ########## @@ -842,6 +893,11 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_bindir}/swappo %{tde_bindir}/transxx %{tde_bindir}/xml2pot +%{tde_mandir}/man1/po2xml.1* +%{tde_mandir}/man1/split2po.1* +%{tde_mandir}/man1/swappo.1* +%{tde_mandir}/man1/transxx.1* +%{tde_mandir}/man1/xml2pot.1* ########## @@ -875,6 +931,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %{tde_datadir}/icons/hicolor/*/mimetypes/umbrellofile.png %{tde_datadir}/mimelnk/application/x-umbrello.desktop %{tde_tdedocdir}/HTML/en/umbrello/ +%{tde_mandir}/man1/umbrello.1* ########## diff --git a/redhat/main/tdetoys/tdetoys.spec b/redhat/main/tdetoys/tdetoys.spec index c9f8a2d23..4767ad8f1 100644 --- a/redhat/main/tdetoys/tdetoys.spec +++ b/redhat/main/tdetoys/tdetoys.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdetoys %define tde_prefix /opt/trinity @@ -87,7 +87,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec index db51bae9a..38004b45f 100644 --- a/redhat/main/tdeutils/tdeutils.spec +++ b/redhat/main/tdeutils/tdeutils.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdeutils %define tde_prefix /opt/trinity @@ -31,6 +31,7 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man %define tde_sbindir %{tde_prefix}/sbin %define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde @@ -84,7 +85,7 @@ BuildRequires: net-snmp-devel BuildRequires: gmp-devel # PYTHON support -%if 0%{?sle_version} >= 150400 +%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9 %define python python3 %define __python %__python3 %else @@ -127,7 +128,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif @@ -270,6 +271,7 @@ package. %{tde_datadir}/icons/hicolor/scalable/apps/ark.svgz %{tde_datadir}/services/ark_part.desktop %{tde_tdedocdir}/HTML/en/ark/ +%{tde_mandir}/man1/ark.1* ########## @@ -299,6 +301,7 @@ It provides: %{tde_datadir}/icons/hicolor/*/apps/kcalc.png %{tde_datadir}/icons/hicolor/scalable/apps/kcalc.svgz %{tde_tdedocdir}/HTML/en/kcalc/ +%{tde_mandir}/man1/kcalc.1* ########## @@ -321,6 +324,7 @@ This package contains kcharselect, a character set selector for TDE. %{tde_datadir}/apps/kicker/applets/kcharselectapplet.desktop %{tde_datadir}/icons/hicolor/*/apps/kcharselect.png %{tde_tdedocdir}/HTML/en/kcharselect/ +%{tde_mandir}/man1/kcharselect.1* ########## @@ -411,6 +415,8 @@ in a file manager. %{tde_datadir}/icons/hicolor/*/apps/kwikdisk.png %{tde_tdedocdir}/HTML/en/kdf/ %{tde_tdedocdir}/HTML/en/kcontrol/storagedevices/ +%{tde_mandir}/man1/kdf.1* +%{tde_mandir}/man1/kwikdisk.1* ########## @@ -437,6 +443,7 @@ reasonably fast start. %{tde_datadir}/config.kcfg/kedit.kcfg %{tde_datadir}/icons/hicolor/*/apps/kedit.png %{tde_tdedocdir}/HTML/en/kedit/ +%{tde_mandir}/man1/kedit.1* ########## @@ -456,6 +463,7 @@ to format 3.5" and 5.25" floppy disks. %{tde_datadir}/apps/konqueror/servicemenus/floppy_format.desktop %{tde_datadir}/icons/hicolor/*/apps/kfloppy.png %{tde_tdedocdir}/HTML/en/kfloppy/ +%{tde_mandir}/man1/kfloppy.1* ########## @@ -491,6 +499,7 @@ Features: %{tde_datadir}/config.kcfg/kgpg.kcfg %{tde_datadir}/icons/hicolor/*/apps/kgpg.png %{tde_tdedocdir}/HTML/en/kgpg/ +%{tde_mandir}/man1/kgpg.1* ########## @@ -518,6 +527,7 @@ support and other powerful features. %{tde_datadir}/services/kbyteseditwidget.desktop %{tde_datadir}/services/khexedit2part.desktop %{tde_tdedocdir}/HTML/en/khexedit/ +%{tde_mandir}/man1/khexedit.1* ########## @@ -781,6 +791,7 @@ Here are just some examples of the things that can be done: %{tde_datadir}/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz %{tde_datadir}/mimelnk/application/x-superkaramba.desktop %{tde_tdedocdir}/HTML/en/superkaramba/ +%{tde_mandir}/man1/superkaramba.1* ########## diff --git a/redhat/main/tdevelop/tdevelop.spec b/redhat/main/tdevelop/tdevelop.spec index 37d7be17c..9f42f074b 100644 --- a/redhat/main/tdevelop/tdevelop.spec +++ b/redhat/main/tdevelop/tdevelop.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdevelop %define tde_prefix /opt/trinity @@ -100,7 +100,7 @@ BuildRequires: libidn-devel # GAMIN support # Not on openSUSE. -%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion} %define with_gamin 1 BuildRequires: gamin-devel %endif diff --git a/redhat/main/tdewebdev/tdewebdev.spec b/redhat/main/tdewebdev/tdewebdev.spec index d3c3624d8..824a8419a 100644 --- a/redhat/main/tdewebdev/tdewebdev.spec +++ b/redhat/main/tdewebdev/tdewebdev.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.12 +%define tde_version 14.0.13 %endif %define tde_pkg tdewebdev %define tde_prefix /opt/trinity |