rpms/kdebase-workspace/devel kdebase-workspace-4.0.3-fedora-logos.patch, NONE, 1.1 kdebase-workspace.spec, 1.60, 1.61

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.3-fedora-logos.patch 
Log Message:
#438973: RFE: replace the kde icon in system menu for a fedora logo


kdebase-workspace-4.0.3-fedora-logos.patch:

--- NEW FILE kdebase-workspace-4.0.3-fedora-logos.patch ---
Index: plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
===================================================================
--- plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	(revision 794725)
+++ plasma/applets/kickoff/simpleapplet/simpleapplet.cpp	(working copy)
@@ -132,7 +132,7 @@
 {
     KConfigGroup cg = config();
 
-    d->icon->setIcon(KIcon(cg.readEntry("icon","start-here-kde")));
+    d->icon->setIcon(KIcon(cg.readEntry("icon","start-here-fedora")));
     //setMinimumContentSize(d->icon->iconSize()); //setSize(d->icon->iconSize())
 
     {
Index: plasma/applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop
===================================================================
--- plasma/applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop	(revision 794725)
+++ plasma/applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop	(working copy)
@@ -84,7 +84,7 @@
 Comment[x-test]=xxTraditional menu based application launcherxx
 Comment[zh_CN]=åŸºäºŽåº”ç”¨ç¨‹åºå¯åŠ¨å™¨çš„ä¼ ç»Ÿèœå•
 Comment[zh_TW]=傳統選單式的應用程式啟動器
-Icon=start-here-kde
+Icon=start-here-fedora
 Type=Service
 X-KDE-ServiceTypes=Plasma/Applet
 X-KDE-Library=plasma_applet_simplelauncher
Index: plasma/applets/kickoff/applet/applet.cpp
===================================================================
--- plasma/applets/kickoff/applet/applet.cpp	(revision 794725)
+++ plasma/applets/kickoff/applet/applet.cpp	(working copy)
@@ -66,7 +66,7 @@
 {
     setHasConfigurationInterface(true);
 
-    d->icon = new Plasma::Icon(KIcon("start-here-kde"), QString(), this);
+    d->icon = new Plasma::Icon(KIcon("start-here-fedora"), QString(), this);
     d->icon->setFlag(ItemIsMovable, false);
     connect(d->icon, SIGNAL(pressed(bool)), this, SLOT(toggleMenu(bool)));
 
Index: plasma/applets/kickoff/applet/plasma-applet-launcher.desktop
===================================================================
--- plasma/applets/kickoff/applet/plasma-applet-launcher.desktop	(revision 794725)
+++ plasma/applets/kickoff/applet/plasma-applet-launcher.desktop	(working copy)
@@ -92,7 +92,7 @@
 Comment[x-test]=xxLauncher to start applicationsxx
 Comment[zh_CN]=应用程序的启动器
 Comment[zh_TW]=應用程式啟動器
-Icon=start-here-kde
+Icon=start-here-fedora
 Type=Service
 X-KDE-ServiceTypes=Plasma/Applet
 


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kdebase-workspace.spec	7 Apr 2008 14:30:36 -0000	1.60
+++ kdebase-workspace.spec	9 Apr 2008 11:26:54 -0000	1.61
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.3
 
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -18,6 +18,7 @@
 Patch3: kdebase-workspace-4.0.2-plasma-konsole.patch
 Patch4: kdebase-workspace-4.0.2-onlyshowkde.patch
 Patch5: kdebase-workspace-4.0.3-ck-shutdown.patch
+Patch6: kdebase-workspace-4.0.3-fedora-logos.patch
 
 # http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu)
 # backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886
@@ -55,6 +56,7 @@
 %{!?_without_nm:BuildRequires: NetworkManager-devel}
 BuildRequires: pam-devel
 BuildRequires: qimageblitz-devel
+BuildRequires: fedora-logos
 
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kde-settings-kdm
@@ -66,6 +68,7 @@
 # but adding here doesn't hurt either -- Rex
 Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme
+Requires: fedora-logos
 
 # startkde references: dbus-launch df mkdir test xmessage xprop xrandr xrdb xset xsetroot
 Requires: coreutils
@@ -121,6 +124,7 @@
 %patch4 -p1 -b .onlyshowkde
 # ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
 %patch5 -p1 -b .ck-shutdown
+%patch6 -p0 -b .fedora-logos
 
 # upstream patches
 %patch101 -p1 -b .menu-switch
@@ -180,6 +184,12 @@
 done
 popd
 
+# 438973: RFE: replace the kde icon in system menu for a fedora logo
+ln -s %{_kde4_iconsdir}/oxygen/16x16/places/start-here-fedora.png %{buildroot}/usr/share/icons/Fedora/16x16/places/start-here.png
+ln -s %{_kde4_iconsdir}/oxygen/22x22/places/start-here-fedora.png %{buildroot}/usr/share/icons/Fedora/24x24/places/start-here.png
+ln -s %{_kde4_iconsdir}/oxygen/32x32/places/start-here-fedora.png %{buildroot}/usr/share/icons/Fedora/32x32/places/start-here.png
+ln -s %{_kde4_iconsdir}/oxygen/48x48/places/start-here-fedora.png %{buildroot}/usr/share/icons/Fedora/48x48/places/start-here.png
+ln -s %{_kde4_iconsdir}/oxygen/64x64/places/start-here-fedora.png %{buildroot}/usr/share/icons/Fedora/96x96/places/start-here.png
 
 %clean
 rm -rf %{buildroot}