RPM Packaging: misc updates for 3.5.13.2

5 files changed, 1 insertions, 162 deletions

diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13-add_french.patch b/redhat/applications/kcmautostart/kcmautostart-3.5.13-add_french.patch
deleted file mode 100644
index dcdb2ef48..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13-add_french.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- kcmautostart/src/autostart.desktop.ORI	2012-05-10 11:47:47.743164035 +0200
-+++ kcmautostart/src/autostart.desktop	2012-05-10 11:49:15.127289325 +0200
-@@ -14,8 +14,10 @@
- Comment=A KControl tool for managing what programs start up with TDE.
- Comment[ca]=Panell de control per a gestionar els programes que s'inicien amb la sessió de TDE.
- Comment[es]=Panel de control para gestionar los programas que se inician con la sesión de TDE.
-+Comment[fr]=Paneau de contrôle pour gérer le démarrage des programmes à l'ouverture de session TDE.
- Keywords=autostart manager
- Name=Autostart Manager
- Name[ca]=Autoengega
- Name[es]=Arranque automático
-+Name[fr]=Démarrage automatique
- Categories=Qt;KDE;X-KDE-settings-components;
-diff -Nuar kcmautostart/po.ori//fr.po kcmautostart/po/fr.po
---- kcmautostart/po.ori//fr.po	1970-01-01 01:00:00.000000000 +0100
-+++ kcmautostart/po/fr.po	2012-05-10 19:27:38.107215981 +0200
-@@ -0,0 +1,52 @@
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"PO-Revision-Date: 2012-05-10 12:01+0100\n"
-+"Project-Id-Version: autostart_ca\n"
-+"Language-Team:  <ca@li.org>\n"
-+"X-Generator: KBabel 1.11.4\n"
-+"MIME-Version: 1.0\n"
-+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-+"Last-Translator: Josep Febrer <josep@extens.info>\n"
-+
-+#: ../src/autostart.cpp:61
-+msgid "Startup"
-+msgstr "Démarrage"
-+
-+#: ../src/autostart.cpp:62
-+msgid "Shutdown"
-+msgstr "Arrêt"
-+
-+#: ../src/autostart.cpp:63
-+msgid "ENV"
-+msgstr "ENV"
-+
-+#: ../src/autostart.cpp:102
-+msgid "Name"
-+msgstr "Nom"
-+
-+#: ../src/autostart.cpp:103
-+msgid "Command"
-+msgstr "Commande"
-+
-+#: ../src/autostart.cpp:104
-+msgid "Run on"
-+msgstr "Executer"
-+
-+#: ../src/autostart.cpp:129
-+msgid "&Add"
-+msgstr "&Ajouter"
-+
-+#: ../src/autostart.cpp:131
-+msgid "&Remove"
-+msgstr "&Supprimer"
-+
-+#: ../src/autostart.cpp:133
-+msgid "&Properties"
-+msgstr "&Propiétés"
-+
-+#: ../src/autostart.cpp:317
-+msgid "This module helps you configure which applications KDE runs When starting up and shutting down."
-+msgstr "Ce module vous aide à configurer quelles applications sont exécutées à l'ouverture et à la fermeture de session de TDE."
-+
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch b/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch
deleted file mode 100644
index fae431e66..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- kcmautostart.ORI/src/autostart.cpp	2012-05-10 11:36:44.887288951 +0200
-+++ kcmautostart.P/src/autostart.cpp	2012-05-10 11:37:16.701639283 +0200
-@@ -88,10 +88,10 @@
-       path = kgs->autostartPath()+"/";
-       break;
-     case Shutdown:
--      path = ksd->localtdedir()+"shutdown/";
-+      path = ksd->localkdedir()+"shutdown/";
-       break;
-     case ENV:
--      path = ksd->localtdedir()+"env/";
-+      path = ksd->localkdedir()+"env/";
-       break;
-   }
-   KIO::file_move(fileName, KURL( path + fileName.fileName() ));
-@@ -190,9 +190,9 @@
-     if (x==0)
-       path = kgs->autostartPath();
-     else if (x==1)
--      path = ksd->localtdedir() + "/shutdown";
-+      path = ksd->localkdedir() + "/shutdown";
-     else if (x==2)
--      path = ksd->localtdedir() + "/env";
-+      path = ksd->localkdedir() + "/env";
- 
-     if (! KStandardDirs::exists(path))
-       KStandardDirs::makeDir(path);
diff --git a/redhat/applications/kcmautostart/kcmautostart-fr.po b/redhat/applications/kcmautostart/kcmautostart-fr.po
deleted file mode 100644
index 6d898bc97..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-fr.po
+++ /dev/null
@@ -1,52 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2012-05-10 12:01+0100\n"
-"Project-Id-Version: autostart_ca\n"
-"Language-Team:  <ca@li.org>\n"
-"X-Generator: KBabel 1.11.4\n"
-"MIME-Version: 1.0\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"Last-Translator: Josep Febrer <josep@extens.info>\n"
-
-#: ../src/autostart.cpp:61
-msgid "Startup"
-msgstr "Démarrage"
-
-#: ../src/autostart.cpp:62
-msgid "Shutdown"
-msgstr "Arrêt"
-
-#: ../src/autostart.cpp:63
-msgid "ENV"
-msgstr "ENV"
-
-#: ../src/autostart.cpp:102
-msgid "Name"
-msgstr "Nom"
-
-#: ../src/autostart.cpp:103
-msgid "Command"
-msgstr "Comande"
-
-#: ../src/autostart.cpp:104
-msgid "Run on"
-msgstr "Executer"
-
-#: ../src/autostart.cpp:129
-msgid "&Add"
-msgstr "&Ajouter"
-
-#: ../src/autostart.cpp:131
-msgid "&Remove"
-msgstr "&Supprimer"
-
-#: ../src/autostart.cpp:133
-msgid "&Properties"
-msgstr "&Propiétés"
-
-#: ../src/autostart.cpp:317
-msgid "This module helps you configure which applications KDE runs When starting up and shutting down."
-msgstr "Ce module vous aide à configurer quelles applications sont exécutées à l'ouverture et à la fermeture de session de TDE."
-
diff --git a/redhat/applications/kde-systemsettings/kde-settings-laptops.directory b/redhat/applications/kde-systemsettings/kde-settings-laptops.directory
deleted file mode 100644
index 687a493c4..000000000
--- a/redhat/applications/kde-systemsettings/kde-settings-laptops.directory
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Laptops & Power
-Name[br]=Gremm
-Name[el]=Ισχύς
-Name[it]=Energia
-Name[mt]=Elettriku
-Name[nl]=Energie
-Name[pa]=ਊਰਜਾ(power)
-Name[pt_BR]=Energia
-Name[ru]=Управление питанием
-Name[sv]=Effekt
-Icon=energy
diff --git a/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch b/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch
index 4aca15ea1..a9e97af33 100644
--- a/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch
+++ b/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch
@@ -5,7 +5,7 @@
  $(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\"
  
 -kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH)
-+kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -lDCOP -lkdefx -lkio
++kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -lDCOP -lkdefx -lkio -lkdecore -lkdeui
  kvirc_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la
  
  bin_PROGRAMS = kvirc