diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-05-30 12:32:22 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-05-30 12:32:22 +0200 |
| commit | 9814f425f0dae6fa0fb869ef038495df9dd0e588 (patch) | |
| tree | 55490fb4f5f265c00d9cd14e53628ff01490b4b0 /redhat/tdebase | |
| parent | b33e4034e7490e5895a5cb2cc54949354842f9d9 (diff) | |
| download | tde-packaging-9814f425f0dae6fa0fb869ef038495df9dd0e588.tar.gz tde-packaging-9814f425f0dae6fa0fb869ef038495df9dd0e588.zip | |
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/tdebase')
| -rw-r--r-- | redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch | 29 | ||||
| -rw-r--r-- | redhat/tdebase/tdebase-14.0.0.spec | 10 |
2 files changed, 23 insertions, 16 deletions
diff --git a/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch b/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch index 231b258e0..5bcf98edd 100644 --- a/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch +++ b/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch @@ -1,35 +1,36 @@ ---- trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/displayconfig/displayconfig.desktop.ORI 2013-05-11 14:53:30.914170537 +0200 -+++ trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/displayconfig/displayconfig.desktop 2013-05-11 14:53:59.495582944 +0200 -@@ -2,6 +2,7 @@ +--- ./kcontrol/displayconfig/displayconfig.desktop.displayconfigtranslation 2014-05-30 12:16:09.448919875 +0200 ++++ ./kcontrol/displayconfig/displayconfig.desktop 2014-05-30 12:19:18.104578759 +0200 +@@ -13,6 +13,7 @@ Categories=Qt;TDE;X-TDE-settings-system; Comment=Configure display Comment[en_US]=Configure display +Comment[fr]=Configuration de l'affichage - DocPath=kcontrol/displayconfig/index.html - Exec=tdecmshell displayconfig + Comment[ru]=Конфигурация экрана + Comment[uk]=Конфігурація екрану GenericName= -@@ -11,6 +12,7 @@ +@@ -21,6 +22,7 @@ MimeType= Name=Monitor & Display Name[en_US]=Monitor & Display +Name[fr]=Moniteurs & Affichage + Name[ru]=Монитор & Экран + Name[uk]=Монітор & Екран NoDisplay=false - Path= - StartupNotify=true ---- trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop.ORI 2013-05-11 21:21:04.241337141 +0200 -+++ trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop 2013-05-11 21:21:44.782537929 +0200 +--- ./kcontrol/iccconfig/iccconfig.desktop.displayconfigtranslation 2014-05-30 12:16:09.448919875 +0200 ++++ ./kcontrol/iccconfig/iccconfig.desktop 2014-05-30 12:20:36.526770672 +0200 @@ -12,6 +12,7 @@ Categories=Qt;TDE;X-TDE-settings-hardware; Comment=Configure display ICC profile Comment[en_US]=Configure display ICC profile +Comment[fr]=Configurer les profils de couleurs ICC + Comment[ru]=Конфигурация профиля ICC экрана + Comment[uk]=Конфігурація профілю ICC екрану GenericName= - GenericName[en_US]= - Keywords=ICC,display,color,profile -@@ -18,5 +19,6 @@ +@@ -20,6 +21,7 @@ MimeType= Name=ICC Color Profile Name[en_US]=ICC Color Profile +Name[fr]=Profils de couleurs ICC + Name[ru]=ICC Профиль цвета + Name[uk]=ICC Профіль кольору - NoDisplay=false diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index ad4cd3386..80d13557f 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -65,8 +65,14 @@ Source7: tdm.service%{?dist} Source7: xdm.oss114 %endif -# Fedora 17: special selinux policy required -%if 0%{?fedora} >= 17 || 0%{?rhel} == 6 +# Fedora >= 17: special selinux policy required for TDM +# If login through TDM takes ages, then look at '/var/log/audit/audit.log'. +# Locate the line containing 'USER_AVC' and dbus stuff. +# Put this line into a temporary file, then (e.g for Fedora 17): +# audit2allow -i /tmp/file -m tdm.fc17 >tdm.fc17.te +# audit2allow -i /tmp/file -M tdm.fc17 + +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 %define with_selinux_policy 1 Source8: tdm%{?dist}.pp %endif |