rpms/kdebase-workspace/F-10 kdebase-workspace.spec,1.130,1.131

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20756/F-10

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Sat Oct 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-7
- F10: use KDM default face icon from solar-kde-theme, require it


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- kdebase-workspace.spec	18 Oct 2008 21:44:48 -0000	1.130
+++ kdebase-workspace.spec	25 Oct 2008 00:41:33 -0000	1.131
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.1.2
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -119,6 +119,13 @@
 Requires: xorg-x11-utils
 Requires: xorg-x11-server-utils
 
+%if 0%{?fedora} == 10
+%define default_face_icon default_solar.png
+Requires: solar-kde-theme
+%else
+%define default_face_icon default1.png
+%endif
+
 %description
 The KDE Workspace consists of what is the desktop of the 
 KDE Desktop Environment.
@@ -237,7 +244,7 @@
 # own %{_kde4_appsdir}/kdm/faces and set default user image
 mkdir -p %{buildroot}%{_kde4_appsdir}/kdm/faces
 pushd %{buildroot}%{_kde4_appsdir}/kdm/faces
-ln -sf ../pics/users/default1.png .default.face.icon
+ln -sf ../pics/users/%{default_face_icon} .default.face.icon
 popd
 
 # move devel symlinks
@@ -343,6 +350,9 @@
 
 
 %changelog
+* Sat Oct 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-7
+- F10: use KDM default face icon from solar-kde-theme, require it
+
 * Sat Oct 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-6
 - reenable panel-autohide-fix-flicker patch
 - backport revision 866998 to fix the CPU consumption problem (kde#172549)