rpms/kdebase/devel kdebase-4.2.0-avoid_kde3_services.patch, NONE, 1.1 kdebase-4.2.0-home-icon.patch, 1.1, 1.2 kdebase.spec, 1.359, 1.360

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10017

Modified Files:
	kdebase-4.2.0-home-icon.patch kdebase.spec 
Added Files:
	kdebase-4.2.0-avoid_kde3_services.patch 
Log Message:
* Thu Feb 12 2009 Rex Dieter <rdieter at fedorparoject.org> - 4.2.0-5
- avoid_kde3_services patch
- fix home-icon patch


kdebase-4.2.0-avoid_kde3_services.patch:

--- NEW FILE kdebase-4.2.0-avoid_kde3_services.patch ---
--- branches/KDE/4.2/kdebase/apps/konqueror/src/konqmainwindow.cpp	2009/01/19 14:02:58	913542
+++ branches/KDE/4.2/kdebase/apps/konqueror/src/konqmainwindow.cpp	2009/02/11 22:50:44	924926
@@ -1777,7 +1777,7 @@
                 "bookmarks"};
         for (uint i=0;i<sizeof(toplevelModules)/sizeof(char*);++i)
             if (KAuthorized::authorizeControlModule(toplevelModules[i]))
-                m_configureDialog->addModule(KCModuleInfo(toplevelModules[i]));
+                m_configureDialog->addModule(KCModuleInfo(QString(toplevelModules[i])+".desktop"));
 
 
         if (KAuthorized::authorizeControlModule("filebehavior") )
@@ -1790,7 +1790,7 @@
                 "kcmtrash"};
             for (uint i=0;i<sizeof(fmModules)/sizeof(char*);++i)
                 if (KAuthorized::authorizeControlModule(fmModules[i]))
-                    m_configureDialog->addModule(KCModuleInfo(fmModules[i]),fileManagementGroup);
+                    m_configureDialog->addModule(KCModuleInfo(QString(fmModules[i])+".desktop"),fileManagementGroup);
         }
 
         if (KAuthorized::authorizeControlModule("khtml_behavior"))
@@ -1812,7 +1812,7 @@
                 "khtml_plugins"};
             for (uint i=0;i<sizeof(webModules)/sizeof(char*);++i)
                 if (KAuthorized::authorizeControlModule(webModules[i]))
-                    m_configureDialog->addModule(KCModuleInfo(webModules[i]),webGroup);
+                    m_configureDialog->addModule(KCModuleInfo(QString(webModules[i])+".desktop"),webGroup);
 
         }
         //END SYNC with initActions()

kdebase-4.2.0-home-icon.patch:

Index: kdebase-4.2.0-home-icon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase-4.2.0-home-icon.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-4.2.0-home-icon.patch	12 Feb 2009 12:08:51 -0000	1.1
+++ kdebase-4.2.0-home-icon.patch	12 Feb 2009 16:24:24 -0000	1.2
@@ -1,7 +1,8 @@
 Index: apps/konqueror/Home.desktop
 ===================================================================
---- apps/konqueror/Home.desktop	(revision 924661)
-+++ apps/konqueror/Home.desktop	(working copy)
+diff -up kdebase-4.2.0/apps/konqueror/Home.desktop.home-icon kdebase-4.2.0/apps/konqueror/Home.desktop
+--- kdebase-4.2.0/apps/konqueror/Home.desktop.home-icon	2009-01-17 04:59:32.000000000 -0600
++++ kdebase-4.2.0/apps/konqueror/Home.desktop	2009-02-12 10:20:43.000000000 -0600
 @@ -1,6 +1,6 @@
  [Desktop Entry]
  Type=Application
@@ -10,11 +11,10 @@
  Icon=user-home
  Terminal=false
  
-@@ -85,89 +85,5 @@
- Name[xh]=Ikhaya
+@@ -85,87 +85,5 @@ Name[xh]=Ikhaya
  Name[zh_CN]=主文件夹
  Name[zh_TW]=家目錄
--
+ 
 -GenericName=Personal Files
 -GenericName[af]=Persoonlike Lêers
 -GenericName[ar]=الملفات الشخصية
@@ -45,7 +45,6 @@
 -GenericName[gu]=અંગત ફાઇલો
 -GenericName[he]=קבצים אישיים
 -GenericName[hi]=निजी फ़ाइलें
--GenericName[hne]=निजी फाइल मन ल
 -GenericName[hr]=Osobne datoteke
 -GenericName[hsb]=Wosobinske dataje
 -GenericName[hu]=Személyes fájlok
@@ -74,7 +73,7 @@
 -GenericName[pa]=ਨਿੱਜੀ ਫਾਇਲਾਂ
 -GenericName[pl]=Pliki osobiste
 -GenericName[pt]=Ficheiros Pessoais
--GenericName[pt_BR]=Arquivos pessoais
+-GenericName[pt_BR]=Arquivos Ppessoais
 -GenericName[ro]=Fișiere personale
 -GenericName[ru]=Личные файлы
 -GenericName[se]=Iežat fiillat


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- kdebase.spec	12 Feb 2009 12:08:51 -0000	1.359
+++ kdebase.spec	12 Feb 2009 16:24:24 -0000	1.360
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -33,6 +33,8 @@
 # bugs.kde.org/162729
 Patch100: kdebase-4.2.0-konsole_kdeinit.patch
 Patch101: kdebase-4.2.0-dolphin-qt45.patch
+# http://websvn.kde.org/?view=rev&revision=924926
+Patch102: kdebase-4.2.0-avoid_kde3_services.patch
 
 #Â Fedora custom patches
 Patch200: kdebase-4.2.0-home-icon.patch
@@ -133,8 +135,9 @@
 
 %patch100 -p1 -b .konsole_kdeinit
 %patch101 -p1 -b .dolphin-qt45
+%patch102 -p4 -b .avoid_kde3_services
 
-%patch200 -p0 -b .home-icon
+%patch200 -p1 -b .home-icon
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -146,7 +149,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -316,6 +319,10 @@
 
 
 %changelog
+* Thu Feb 12 2009 Rex Dieter <rdieter at fedorparoject.org> - 4.2.0-5
+- avoid_kde3_services patch
+- fix home-icon patch
+
 * Thu Feb 12 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.0-4
 - add Home icon to the Applications menu by default (#457756)