diff options
author | François Andriot <albator78@libertysurf.fr> | 2021-01-30 14:34:02 +0100 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2021-01-30 22:29:41 +0100 |
commit | 6581dc50b83f203d65eac61c00a159ab2a6ddb5d (patch) | |
tree | 85c02d38ca9dcedc28798ee41c4b16ec7260e9bc /redhat/main/tdebase/tdebase.spec | |
parent | 87e57a1a070839a44db16a0410ef57902db2df3e (diff) | |
download | tde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.tar.gz tde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.zip |
RPM: massive update and cleanup
Diffstat (limited to 'redhat/main/tdebase/tdebase.spec')
-rw-r--r-- | redhat/main/tdebase/tdebase.spec | 168 |
1 files changed, 118 insertions, 50 deletions
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index e6a4cb4d6..cf33058c7 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.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdebase %define tde_prefix /opt/trinity @@ -73,11 +73,6 @@ Source5: pamd.kscreensaver-trinity%{?dist} Source6: suse-displaymanagers-tdm %endif -# Fedora 18: use SYSTEMD for TDM startup -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -Source7: tdm.service%{?dist} -%endif - # openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!! %if 0%{?suse_version} == 1140 Source7: xdm%{?dist} @@ -92,7 +87,7 @@ Source7: xdm%{?dist} %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 %define with_selinux_policy 1 -Source8: tdm%{?dist}.pp +Source8: tdm%{?dist}.te %endif %if 0%{?mgaversion} >= 3 @@ -229,7 +224,39 @@ Requires: fedora-logos # Fedora 28 Theme %if 0%{?fedora} == 28 Requires: f28-backgrounds-base -%define tde_bg /usr/share/backgrounds/f27/default/standard/f28.png +%define tde_bg /usr/share/backgrounds/f28/default/standard/f28.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 29 Theme +%if 0%{?fedora} == 29 +Requires: f29-backgrounds-base +%define tde_bg /usr/share/backgrounds/f29/default/standard/f29.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 30 Theme +%if 0%{?fedora} == 30 +Requires: f30-backgrounds-base +%define tde_bg /usr/share/backgrounds/f30/default/standard/f30.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 31 Theme +%if 0%{?fedora} == 31 +Requires: f31-backgrounds-base +%define tde_bg /usr/share/backgrounds/f31/default/standard/f31.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 32 Theme +%if 0%{?fedora} == 32 +Requires: f32-backgrounds-base +%define tde_bg /usr/share/backgrounds/f32/default/standard/f32.png Requires: fedora-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png %endif @@ -263,6 +290,13 @@ Requires: redhat-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png %endif +# RHEL 8 Theme +%if 0%{?rhel} == 8 +Requires: redhat-logos +%define tde_bg /usr/share/backgrounds/c8/default/normalish/c8.png +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png +%endif + # Mageia 2 Theme %if 0%{?mgaversion} == 2 Requires: mageia-theme-Default @@ -298,6 +332,13 @@ Requires: mageia-theme-Default %define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg %endif +# Mageia 7 Theme +%if 0%{?mgaversion} == 7 +Requires: mageia-theme-Default +%define tde_bg /usr/share/mga/backgrounds/default.jpg +%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg +%endif + # Mandriva 2011 Theme: "rosa" %if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100" Requires: mandriva-theme @@ -381,6 +422,22 @@ Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif +# OpenSuse 15.1 Theme +%if "%{?suse_version}" == "1510" +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}" == "1550" +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 + BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -512,7 +569,7 @@ BuildRequires: OpenEXR-devel # RHEL 5: available in centos-extras # RHEL 6: available in EPEL # RHEL 7: available in NUX -%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} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -715,6 +772,12 @@ BuildRequires: libnsl-devel # ATTR support BuildRequires: libattr-devel +# SELINUX support +%if 0%{?rhel} >= 6 || 0%{?fedora} +BuildRequires: checkpolicy +BuildRequires: selinux-policy-devel +%endif + # tdebase is a metapackage that installs all sub-packages Requires: %{name}-runtime-data-common = %{version}-%{release} Requires: %{name}-data = %{version}-%{release} @@ -956,7 +1019,7 @@ Some random features: %{tde_tdeappdir}/kate.desktop %{tde_datadir}/apps/kate/ %{tde_datadir}/apps/tdeconf_update/kate-2.4.upd -%config(noreplace) %{_sysconfdir}/trinity/katerc +%config(noreplace) %{tde_confdir}/katerc %{tde_datadir}/icons/hicolor/*/apps/kate.png %{tde_datadir}/icons/hicolor/*/apps/kate2.svgz %{tde_datadir}/servicetypes/kateplugin.desktop @@ -1244,6 +1307,7 @@ plugdev group. %{tde_datadir}/applnk/Settings/WebBrowsing/smb.desktop %{tde_datadir}/apps/kcm_componentchooser/kcm_browser.desktop %{tde_datadir}/apps/kcm_componentchooser/kcm_kemail.desktop +%{tde_datadir}/apps/kcm_componentchooser/kcm_filemanager.desktop %{tde_datadir}/apps/kcm_componentchooser/kcm_terminal.desktop %{tde_datadir}/apps/kcmview1394/ %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop @@ -1357,7 +1421,7 @@ TDE applications, particularly those in the TDE base module. %{tde_bindir}/kreadconfig %{tde_bindir}/kwriteconfig %{tde_bindir}/kstart -%config(noreplace) %{_sysconfdir}/trinity/kxkb_groups +%config(noreplace) %{tde_confdir}/kxkb_groups %{tde_bindir}/drkonqi %{tde_bindir}/crashtest %{tde_bindir}/kapplymousetheme @@ -1497,7 +1561,7 @@ needed for a basic TDE desktop installation. %files data %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/trinity/tdeshorturifilterrc +%config(noreplace) %{tde_confdir}/tdeshorturifilterrc %{tde_datadir}/applnk/.hidden/battery.desktop %{tde_datadir}/applnk/.hidden/bwarning.desktop %{tde_datadir}/applnk/.hidden/cwarning.desktop @@ -1577,6 +1641,7 @@ needed for a basic TDE desktop installation. %{tde_datadir}/icons/crystalsvg/*/apps/penguin.png %{tde_datadir}/icons/crystalsvg/*/categories/preferences-desktop-personal.png %{tde_datadir}/icons/crystalsvg/*/apps/phppg.png +%{tde_datadir}/icons/crystalsvg/*/apps/package_games_logic.png %{tde_datadir}/icons/crystalsvg/*/apps/proxy.png %{tde_datadir}/icons/crystalsvg/*/apps/pysol.png %{tde_datadir}/icons/crystalsvg/*/apps/randr.png @@ -1755,7 +1820,6 @@ needed for a basic TDE desktop installation. # XDG directories information %dir %{_sysconfdir}/xdg/menus/applications-merged %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu -%config(noreplace) %{_sysconfdir}/xdg/menus/tde-information.menu %config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu %config(noreplace) %{_sysconfdir}/xdg/menus/tde-settings.menu @@ -1827,6 +1891,8 @@ group. %{tde_tdelibdir}/kcm_cgi.so %{tde_tdelibdir}/kcm_media.la %{tde_tdelibdir}/kcm_media.so +%{tde_tdelibdir}/kcm_trash.la +%{tde_tdelibdir}/kcm_trash.so %{tde_tdelibdir}/kded_homedirnotify.la %{tde_tdelibdir}/kded_homedirnotify.so %{tde_tdelibdir}/kded_mediamanager.la @@ -1884,6 +1950,7 @@ group. %{tde_tdelibdir}/textthumbnail.la %{tde_tdelibdir}/textthumbnail.so %{tde_tdeappdir}/kcmcgi.desktop +%{tde_datadir}/applications/tde/kcmtrash.desktop %{tde_datadir}/apps/tdeio_finger/ %{tde_datadir}/apps/tdeio_info/ %{tde_datadir}/apps/tdeio_man/ @@ -2048,6 +2115,7 @@ Installation of smbclient will make you able to use smb shared printers. %{tde_datadir}/apps/tdeprintfax/ %{tde_datadir}/apps/kjobviewer/ %{tde_datadir}/apps/tdeprint_part/ +%{tde_datadir}/autostart/kjobviewer-autostart.desktop %{tde_datadir}/icons/hicolor/*/apps/tdeprintfax.png %{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png %{tde_datadir}/icons/hicolor/*/apps/printmgr.png @@ -2087,10 +2155,9 @@ the TDE desktop. %files -n trinity-kdesktop %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu1 -%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu2 +%config(noreplace) %{tde_confdir}/kdesktop_custom_menu1 +%config(noreplace) %{tde_confdir}/kdesktop_custom_menu2 %{tde_bindir}/kcheckrunning -%{tde_bindir}/kxdglauncher %{tde_bindir}/tdeeject %{tde_bindir}/kdesktop %{tde_bindir}/kdesktop_lock @@ -2191,7 +2258,10 @@ already. Most users won't need this. %dir %{tdm_datadir}/sessions %{tdm_datadir}/sessions/*.desktop %{tdm_datadir}/themes/ -%{tde_confdir}/%{tdm} +%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 @@ -2217,8 +2287,8 @@ already. Most users won't need this. %if 0%{?suse_version} >= 1210 /usr/lib/X11/displaymanagers/tdm %endif -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -/usr/lib/systemd/system/tdm.service +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 +#/usr/lib/systemd/system/tdm.service %endif %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6 %{_datadir}/xsessions/tde.desktop @@ -2232,7 +2302,7 @@ already. Most users won't need this. # SELINUX policy %if 0%{?with_selinux_policy} -%{?_sysconfdir}/trinity/%{tdm}/tdm.pp +%config %{tde_confdir}/%{tdm}/tdm.pp %endif # Logrotate configuration @@ -2241,22 +2311,22 @@ already. Most users won't need this. %pre -n trinity-tdm # Make sure that TDM configuration files are now under '/etc/trinity/tdm' if [ -d "%{tde_datadir}/config/%{tdm}" ] && [ ! -L "%{tde_datadir}/config/%{tdm}" ]; then - if [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then + if [ -d "%{tde_confdir}/%{tdm}" ]; then # If there is already something under '/etc/trinity/tdm', simply delete old configuration echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'" rm -rf "%{tde_datadir}/config/%{tdm}" else # Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm' - if [ ! -d "%{_sysconfdir}/trinity" ]; then - mkdir -p "%{_sysconfdir}/trinity" + if [ ! -d "%{tde_confdir}" ]; then + mkdir -p "%{tde_confdir}" fi - echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{_sysconfdir}/trinity/%{tdm}'" - mv -f "%{tde_datadir}/config/%{tdm}" "%{_sysconfdir}/trinity/%{tdm}.migr" + echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{tde_confdir}/%{tdm}'" + mv -f "%{tde_datadir}/config/%{tdm}" "%{tde_confdir}/%{tdm}.migr" fi fi # Remove actual directory before creating a symlink -if [ ! -L "%{tdm_datadir}/pics/users" ]; then +if [ ! -L "%{tdm_datadir}/pics/users" ] && [ -d "%{tdm_datadir}/pics/users" ] ; then [ -d "%{_datadir}/faces" ] || mkdir -p "%{_datadir}/faces" cp -f "%{tdm_datadir}/pics/users/"* "%{_datadir}/faces" rm -rf "%{tdm_datadir}/pics/users" @@ -2269,7 +2339,7 @@ fi # SELINUX context for tdm %if 0%{?with_selinux_policy} -/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp" +/usr/sbin/semodule -i "%{tde_confdir}/%{tdm}/tdm.pp" %endif %if 0%{?fedora} == 21 || 0%{?rhel} >= 7 @@ -2288,7 +2358,7 @@ fi # Sets default language for TDM if [ "$1" = "1" ]; then if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then - sed -i "%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|" + sed -i "%{tde_confdir}/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|" fi fi @@ -2304,9 +2374,9 @@ update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanage %posttrans -n trinity-tdm # Make sure that TDM configuration files are now under '/etc/trinity/tdm' -if [ -d "%{_sysconfdir}/trinity/%{tdm}.migr" ] && [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then - mv -f "%{_sysconfdir}/trinity/%{tdm}.migr/"* "%{_sysconfdir}/trinity/%{tdm}/" - rmdir "%{_sysconfdir}/trinity/%{tdm}.migr/" +if [ -d "%{tde_confdir}/%{tdm}.migr" ] && [ -d "%{tde_confdir}/%{tdm}" ]; then + mv -f "%{tde_confdir}/%{tdm}.migr/"* "%{tde_confdir}/%{tdm}/" + rmdir "%{tde_confdir}/%{tdm}.migr/" fi %postun -n trinity-tdm @@ -2549,7 +2619,7 @@ web browser if the clipboard contains a URL. %files -n trinity-klipper %defattr(-,root,root,-) %{tde_bindir}/klipper -%config(noreplace) %{_sysconfdir}/trinity/klipperrc +%config(noreplace) %{tde_confdir}/klipperrc %{tde_tdelibdir}/klipper.la %{tde_tdelibdir}/klipper.so %{tde_tdelibdir}/klipper_panelapplet.la @@ -2628,7 +2698,7 @@ ever launching another application. %files -n trinity-konqueror %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/trinity/konqsidebartng.rc +%config(noreplace) %{tde_confdir}/konqsidebartng.rc %{tde_bindir}/kbookmarkmerger %{tde_bindir}/keditbookmarks %{tde_bindir}/kfmclient @@ -2708,7 +2778,6 @@ ever launching another application. %{tde_datadir}/apps/konqueror/pics/indicator_viewactive.png %{tde_datadir}/apps/konqueror/profiles/ %exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop -%exclude %{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop %{tde_datadir}/apps/konqueror/servicemenus/*.desktop %ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop @@ -2807,6 +2876,7 @@ Using Konsole, a user can open: %files -n trinity-konsole %defattr(-,root,root,-) %{tde_bindir}/konsole +%{tde_bindir}/terminalhere %{tde_tdelibdir}/kcm_konsole.la %{tde_tdelibdir}/kcm_konsole.so %{tde_tdelibdir}/kded_kwrited.la @@ -2822,7 +2892,6 @@ Using Konsole, a user can open: %{tde_datadir}/applnk/.hidden/kcmkonsole.desktop %{tde_datadir}/apps/tdeconf_update/konsole.upd %{tde_datadir}/apps/tdeconf_update/schemaStrip.pl -%{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop %{tde_datadir}/apps/konsole/ %{tde_datadir}/icons/hicolor/*/apps/konsole.* %{tde_datadir}/mimelnk/application/x-konsole.desktop @@ -3040,7 +3109,7 @@ to monitor it through the daemon running there. %files -n trinity-ksysguardd %defattr(-,root,root,-) %{tde_bindir}/ksysguardd -%config(noreplace) %{_sysconfdir}/trinity/ksysguarddrc +%config(noreplace) %{tde_confdir}/ksysguarddrc ########## @@ -3179,10 +3248,10 @@ These libraries allow you to use TDE dialogs in native TQt3 applications. %files libtqt3-integration %defattr(-,root,root,-) -%{tde_tdelibdir}/plugins/integration/ -%{tde_tdelibdir}/kded_kdeintegration.la -%{tde_tdelibdir}/kded_kdeintegration.so -%{tde_datadir}/services/kded/kdeintegration.desktop +%{_libdir}/tqt3/plugins/integration/ +%{tde_tdelibdir}/kded_tdeintegration.la +%{tde_tdelibdir}/kded_tdeintegration.so +%{tde_datadir}/services/kded/tdeintegration.desktop ########## @@ -3357,8 +3426,8 @@ fi -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ - -DCONFIG_INSTALL_DIR="%{_sysconfdir}/trinity" \ - -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \ -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \ \ -DWITH_ALL_OPTIONS=ON \ @@ -3408,6 +3477,9 @@ 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 + -DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \ +%endif .. %__make %{?_smp_mflags} || %__make @@ -3470,7 +3542,7 @@ EOF %endif # TDM configuration -%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \ +%__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \ %if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4 -e "s/^#*MinShowUID=.*/MinShowUID=1000/" %else @@ -3499,15 +3571,11 @@ fi %__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g" %endif -# Fedora 18 / RHEL 7: no more SYSV init script, we have to use systemd to launch TDM. -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -%__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service" -%__sed -i "s|kdm|tdm|g" "%{?buildroot}/usr/lib/systemd/system/tdm.service" -%endif - # SELINUX policy for RHEL / Fedora %if 0%{?with_selinux_policy} -%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp" +%__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 # Mageia icon for TDE menu |