rpms/kdebase/devel kdebase.spec,1.252,1.253

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26760

Modified Files:
	kdebase.spec 
Log Message:
* Wed May 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-11
- fix /usr/share/config/kdm conflict with kde-settings 



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- kdebase.spec	15 May 2007 19:51:49 -0000	1.252
+++ kdebase.spec	16 May 2007 19:12:31 -0000	1.253
@@ -16,10 +16,10 @@
 %define arts 1
 
 Summary: K Desktop Environment - core files
-Name: kdebase
-Epoch: 6
+Name:    kdebase
+Epoch:   6
 Version: 3.5.6
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 License: GPL
 Url: http://www.kde.org
@@ -321,6 +321,9 @@
 ln -sf ../pics/users/default1.png .default.face.icon
 popd
 
+# nuke default kdm setup in favor of our own
+rm -rf  %{buildroot}%{_datadir}/config/kdm
+
 %if ! %{kde_settings}
 # install config files
 pushd %{buildroot}
@@ -330,8 +333,7 @@
 find etc/skel/.kde -type d | xargs chmod 0755
 popd
 
-# Symlink things to their correct place
-rm -rf  %{buildroot}%{_datadir}/config/kdm
+# Symlink kdm things to their correct place
 ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
 
 # Replace the kdm default files with symlinks to the shared {kxg}dm ones
@@ -344,7 +346,7 @@
 popd
 
 # kde resource
-install -p -m 644 %{SOURCE12} %{buildroot}/etc/
+install -p -D -m 644 %{SOURCE12} %{buildroot}/etc/kderc
 %endif
 
 # Make symlinks relative
@@ -631,6 +633,9 @@
 
 
 %changelog
+* Wed May 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-11
+- fix /usr/share/config/kdm conflict with kde-settings 
+
 * Tue May 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-10
 - drop unconditional --with-sensors, let %%configure autodetect