rpms/kdebase-workspace/devel fedora-kde.theme, NONE, 1.1 fedora-logo-icon-16.png, NONE, 1.1 fedora-logo-icon-22.png, NONE, 1.1 fedora-logo-icon-32.png, NONE, 1.1 fedora-logo-icon-48.png, NONE, 1.1 fedora-logo-icon-64.png, NONE, 1.1 kdebase-workspace.spec, 1.61, 1.62 kdebase-workspace-4.0.3-fedora-logos.patch, 1.1, NONE

[Lukas Tinkl (ltinkl)]

Author: ltinkl

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	fedora-kde.theme fedora-logo-icon-16.png 
	fedora-logo-icon-22.png fedora-logo-icon-32.png 
	fedora-logo-icon-48.png fedora-logo-icon-64.png 
Removed Files:
	kdebase-workspace-4.0.3-fedora-logos.patch 
Log Message:
2nd attempt at Fedora logo for Plasma menu by creating a fedora-kde 
icon theme



--- NEW FILE fedora-kde.theme ---
[Icon Theme]
Name=Fedora KDE
Comment=Default Fedora icon theme for KDE 4
Inherits=oxygen
DisplayDepth=32
Example=start-here


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kdebase-workspace.spec	9 Apr 2008 11:26:54 -0000	1.61
+++ kdebase-workspace.spec	9 Apr 2008 12:46:42 -0000	1.62
@@ -6,8 +6,15 @@
 Name: kdebase-workspace
 Version: 4.0.3
 
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
+Source1: fedora-logo-icon-16.png
+Source2: fedora-logo-icon-22.png
+Source3: fedora-logo-icon-32.png
+Source4: fedora-logo-icon-48.png
+Source5: fedora-logo-icon-64.png
+Source6: fedora-kde.theme
+
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
@@ -18,7 +25,6 @@
 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
@@ -56,7 +62,6 @@
 %{!?_without_nm:BuildRequires: NetworkManager-devel}
 BuildRequires: pam-devel
 BuildRequires: qimageblitz-devel
-BuildRequires: fedora-logos
 
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kde-settings-kdm
@@ -68,7 +73,6 @@
 # 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
@@ -124,7 +128,6 @@
 %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
@@ -185,11 +188,13 @@
 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
+install -m644 -d %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/fedora-kde/16x16/places/start-here.png
+install -m644 -d %{SOURCE2} %{buildroot}%{_kde4_iconsdir}/fedora-kde/22x22/places/start-here.png
+install -m644 -d %{SOURCE3} %{buildroot}%{_kde4_iconsdir}/fedora-kde/32x32/places/start-here.png
+install -m644 -d %{SOURCE4} %{buildroot}%{_kde4_iconsdir}/fedora-kde/48x48/places/start-here.png
+install -m644 -d %{SOURCE5} %{buildroot}%{_kde4_iconsdir}/fedora-kde/64x64/places/start-here.png
+
+install -m644 -d %{SOURCE6} %{buildroot}%{_kde4_iconsdir}/fedora-kde/index.theme
 
 %clean
 rm -rf %{buildroot}
@@ -253,6 +258,9 @@
 
 
 %changelog
+* Wed Apr  9 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.3-9
+- #438973: RFE: replace the kde icon in system menu for a fedora logo
+
 * Mon Apr 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-7
 - own %%{_kde4_appsdir}/kdm/faces and set default user image (#441154)
 


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