RPM packaging: update packages

4 files changed, 0 insertions, 82 deletions

diff --git a/redhat/tdebase/tdebase-14.0.0-fix_starttde_trap.patch b/redhat/tdebase/tdebase-14.0.0-fix_starttde_trap.patch
deleted file mode 100644
index fb50a6d6f..000000000
--- a/redhat/tdebase/tdebase-14.0.0-fix_starttde_trap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tdebase/starttde.ORI	2014-04-20 18:05:28.820084805 +0200
-+++ tdebase/starttde	2014-04-20 18:06:08.059237113 +0200
-@@ -81,7 +81,7 @@
- 
- # When the X server dies we get a HUP signal from xinit. We must ignore it
- # because we still need to do some cleanup.
--trap '[starttde] echo GOT SIGHUP' HUP
-+trap 'echo "[starttde] GOT SIGHUP"' HUP
- 
- # Check if a TDE session is already running.
- if kcheckrunning >/dev/null 2>&1; then
diff --git a/redhat/tdebase/tdebase-14.0.0-kcontrol_menu_entry.patch b/redhat/tdebase/tdebase-14.0.0-kcontrol_menu_entry.patch
deleted file mode 100644
index 0d73de5a4..000000000
--- a/redhat/tdebase/tdebase-14.0.0-kcontrol_menu_entry.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./kcontrol/kcontrol/KControl.desktop~	2013-01-09 02:12:13.000000000 +0100
-+++ ./kcontrol/kcontrol/KControl.desktop	2013-05-08 17:55:54.250733219 +0200
-@@ -5,7 +5,7 @@
- DocPath=kcontrol/index.html
- X-TDE-StartupNotify=true
- 
--Name=Control Center
-+Name=Trinity Control Center
- Name[af]=Beheer Sentrum
- Name[ar]=مركز التحكم
- Name[az]=İdarə Mərkəzi
-@@ -28,7 +28,7 @@
- Name[eu]=Kontrol gunea
- Name[fa]=مرکز کنترل
- Name[fi]=Ohjauskeskus
--Name[fr]=Centre de configuration de TDE
-+Name[fr]=Centre de configuration de Trinity
- Name[fy]=Konfiguraasjesintrum
- Name[ga]=Lárionad Rialaithe
- Name[gl]=Centro de Control
diff --git a/redhat/tdebase/tdebase-14.0.0-kickoff_xdg_dirs.patch b/redhat/tdebase/tdebase-14.0.0-kickoff_xdg_dirs.patch
deleted file mode 100644
index 0a692c42b..000000000
--- a/redhat/tdebase/tdebase-14.0.0-kickoff_xdg_dirs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- ./kicker/kicker/ui/k_new_mnu.cpp.ori	2013-05-08 21:56:01.084691260 +0200
-+++ ./kicker/kicker/ui/k_new_mnu.cpp	2013-05-08 21:58:02.086130445 +0200
-@@ -1428,6 +1428,42 @@
-            m_systemView->insertItem( "folder_man", i18n( "My Documents" ), documentPath, documentPath, nId++, index++ );
-     }
- 
-+    if ( TDEStandardDirs::exists( TDEGlobalSettings::picturesPath() + "/" ) )
-+    {
-+        TQString picturesPath = TDEGlobalSettings::picturesPath();
-+        if ( picturesPath.endsWith( "/" ) )
-+            picturesPath = picturesPath.left( picturesPath.length() - 1 );
-+        if (picturesPath!=TQDir::homeDirPath())
-+           m_systemView->insertItem( "folder_image", i18n( "My Images" ), picturesPath, picturesPath, nId++, index++ );
-+   }
-+
-+    if ( TDEStandardDirs::exists( TDEGlobalSettings::musicPath() + "/" ) )
-+    {
-+        TQString musicPath = TDEGlobalSettings::musicPath();
-+        if ( musicPath.endsWith( "/" ) )
-+            musicPath = musicPath.left( musicPath.length() - 1 );
-+        if (musicPath!=TQDir::homeDirPath())
-+           m_systemView->insertItem( "folder_sound", i18n( "My Music" ), musicPath, musicPath, nId++, index++ );
-+    }
-+
-+    if ( TDEStandardDirs::exists( TDEGlobalSettings::videosPath() + "/" ) )
-+    {
-+        TQString videosPath = TDEGlobalSettings::videosPath();
-+        if ( videosPath.endsWith( "/" ) )
-+            videosPath = videosPath.left( videosPath.length() - 1 );
-+        if (videosPath!=TQDir::homeDirPath())
-+           m_systemView->insertItem( "folder_video", i18n( "My Videos" ), videosPath, videosPath, nId++, index++ );
-+    }
-+
-+    if ( TDEStandardDirs::exists( TDEGlobalSettings::downloadPath() + "/" ) )
-+    {
-+        TQString downloadPath = TDEGlobalSettings::downloadPath();
-+        if ( downloadPath.endsWith( "/" ) )
-+            downloadPath = downloadPath.left( downloadPath.length() - 1 );
-+        if (downloadPath!=TQDir::homeDirPath())
-+           m_systemView->insertItem( "folder_inbox", i18n( "My Downloads" ), downloadPath, downloadPath, nId++, index++ );
-+    }
-+
-     m_systemView->insertItem( "network", i18n( "Network Folders" ),
-                               "remote:/", "remote:/", nId++, index++ );
- 
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 0f92dad16..32e461e56 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -82,7 +82,6 @@ Source9:	mgabutton.svg
 %endif
 
 # Patch party !
-#Patch0:		tdebase-14.0.0-ftbfs.patch
 
 # Permanent patches, all TDE versions
 ## [tdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
@@ -98,9 +97,7 @@ Patch105:		tdebase-14.0.0-konsole_wordseps.patch
 
 # Patches from Mandriva
 Patch201:	tdebase-14.0.0-vibrate_dialog.patch
-Patch202:	tdebase-14.0.0-kcontrol_menu_entry.patch
 Patch203:	tdebase-14.0.0-kdesktop_crossfade.patch
-Patch204:	tdebase-14.0.0-kickoff_xdg_dirs.patch
 Patch205:	tdebase-14.0.0-suspend_unmount.patch
 Patch206:	tdebase-14.0.0-bookmark_global_copy.patch
 
@@ -3333,7 +3330,6 @@ Windows and Samba shares.
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-#patch0 -p1 -b .ftbfs
 
 %patch101 -p1 -b .openterminalhere
 %patch102 -p1 -b .startmenuicon
@@ -3341,9 +3337,7 @@ Windows and Samba shares.
 %patch105 -p1 -b .konsolewordseps
 
 %patch201 -p1 -b .vibrate_dialog
-%patch202 -p1 -b .kcontrol_menu_entry
 %patch203 -p1 -b .kdesktop_crossfade
-%patch204 -p1 -b .kickoff_xdg
 %patch205 -p1 -b .suspend_unmount
 %patch206 -p1 -b .bookmark_global_copy