From ef403b9174a4521b2a3539d777983b21c8752d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sat, 25 Jan 2014 20:03:06 +0100
Subject: RPM Packaging: update R14 packages

---
 .../tdebase/tdebase-14.0.0-displayconfig_translation.patch   | 12 ++++++------
 redhat/tdebase/tdebase-14.0.0.spec                           |  9 +++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'redhat/tdebase')

diff --git a/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch b/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch
index 76fd104ba..0ed0de35c 100644
--- a/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch
+++ b/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch
@@ -5,10 +5,10 @@
  Comment=Configure display
  Comment[en_US]=Configure display
 +Comment[fr]=Configuration de l'affichage
- # Restore the following key and remove this comment when a help handbook
- # is written. Disabling this key prevents populating the main handbook
- # table of contents with a non-existent document, which results in a
-@@ -17,6 +18,7 @@
+ DocPath=kcontrol/displayconfig/index.html
+ Exec=tdecmshell displayconfig
+ GenericName=
+@@ -11,6 +12,7 @@
  MimeType=
  Name=Monitor & Display
  Name[en_US]=Monitor & Display
@@ -18,7 +18,7 @@
  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
-@@ -18,6 +18,7 @@
+@@ -12,6 +12,7 @@
  Categories=Qt;TDE;X-TDE-settings-hardware;
  Comment=Configure display ICC profile
  Comment[en_US]=Configure display ICC profile
@@ -26,7 +26,7 @@
  GenericName=
  GenericName[en_US]=
  Keywords=ICC,display,color,profile
-@@ -24,5 +25,6 @@
+@@ -18,5 +19,6 @@
  MimeType=
  Name=ICC Color Profile
  Name[en_US]=ICC Color Profile
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index e71cb7aaf..f1417f7ae 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -914,7 +914,7 @@ plugdev group.
 %{tde_bindir}/keditfiletype
 %{tde_bindir}/tdefontinst
 %{tde_bindir}/tdefontview
-%{tde_bindir}/kinfocenter
+#%{tde_bindir}/kinfocenter
 %{tde_bindir}/klocaldomainurifilterhelper
 %{tde_bindir}/krdb
 %{tde_tdelibdir}/fontthumbnail.la
@@ -1078,7 +1078,7 @@ plugdev group.
 %{tde_tdeappdir}/tdehtml_behavior.desktop
 %{tde_tdeappdir}/tdehtml_fonts.desktop
 %{tde_tdeappdir}/tdehtml_java_js.desktop
-%{tde_tdeappdir}/kinfocenter.desktop
+#%{tde_tdeappdir}/kinfocenter.desktop
 %{tde_tdeappdir}/kthememanager.desktop
 %{tde_tdeappdir}/lanbrowser.desktop
 %{tde_tdeappdir}/language.desktop
@@ -1358,7 +1358,7 @@ needed for a basic TDE desktop installation.
 %{tde_datadir}/apps/kcontrol/
 %{tde_datadir}/apps/tdedisplay/
 %{tde_datadir}/apps/tdefontview/
-%{tde_datadir}/apps/kinfocenter/kinfocenterui.rc
+#%{tde_datadir}/apps/kinfocenter/kinfocenterui.rc
 %{tde_datadir}/apps/kthememanager/themes/*
 %{tde_datadir}/icons/crystalsvg/*/apps/access.png
 %{tde_datadir}/icons/crystalsvg/*/apps/acroread.png
@@ -1594,7 +1594,7 @@ needed for a basic TDE desktop installation.
 
 %{tde_tdedocdir}/HTML/en/kcontrol/
 %exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-%{tde_tdedocdir}/HTML/en/kinfocenter/
+#%{tde_tdedocdir}/HTML/en/kinfocenter/
 
 %post data
 for f in crystalsvg ; do
@@ -1888,6 +1888,7 @@ Installation of smbclient will make you able to use smb shared printers.
 %{tde_datadir}/services/print.protocol
 %{tde_datadir}/services/printdb.protocol
 %{tde_tdedocdir}/HTML/en/tdeprint/
+%{tde_tdedocdir}/HTML/en/tdeprintfax/
 
 %post -n trinity-tdeprint
 /sbin/ldconfig || :
-- 
cgit v1.2.1