From ddff93bacae0936ca74d8fcfbe216015533feb1d Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Jun 18 2007 15:36:42 +0000
Subject: - cleanup kde-setings, bz#242564


---

diff --git a/.cvsignore b/.cvsignore
index 5d2815e..670a5b7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,4 @@ kde-settings-3.5-25.tar.gz
 kde-settings-3.5-26.tar.gz
 kde-settings-3.5-27.tar.gz
 kde-settings-3.5-28.tar.bz2
+kde-settings-3.5-29.tar.bz2
diff --git a/kde-settings.spec b/kde-settings.spec
index 214c3f1..3ae78f2 100644
--- a/kde-settings.spec
+++ b/kde-settings.spec
@@ -1,10 +1,10 @@
 
-%define rel 28
+%define rel 29
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 3.5
-Release: %{rel}%{?dist}.1
+Release: %{rel}%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
@@ -40,32 +40,9 @@ Requires: xorg-x11-xdm
 %prep
 %setup -q -c -n %{name}
 
-# fc6+ uses FedoraDNA
-%if 0%{?fedora} > 5 
-sed -i \
-  -e "s|^Theme=.*|Theme=%{_datadir}/apps/kdm/themes/FedoraDNA|" \
-  etc/kde/kdm/kdmrc
-%endif
-
-# fc7 uses Echo,FedoraFlyingHigh
-%if 0%{?fedora} > 6
-sed -i \
-  -e "s|^ColorScheme=.*|ColorScheme=FedoraFlyingHigh|" \
-  -e "s|^Theme=.*|Theme=%{_datadir}/apps/kdm/themes/FedoraFlyingHigh|" \
-  etc/kde/kdm/kdmrc
-sed -i \
-  -e "s|^Theme=.*|Theme=Echo|" \
-  usr/share/kde-settings/kde-profile/default/share/config/ksplashrc  
-%endif
-
-
-
-
-
 %build
 # Intentionally left blank.  Nothing to see here.
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT{%{_datadir}/config,%{_sysconfdir}/kde/kdm}
@@ -113,7 +90,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/kde/kdm
 %config(noreplace) %{_sysconfdir}/kde/kdm/backgroundrc
 %config(noreplace) %{_sysconfdir}/kde/kdm/kdmrc
-%ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/kde/kdm/kdmrc.bak
 %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/kde/kdm/README*
 %{_sysconfdir}/kde/kdm/Xaccess
 %{_sysconfdir}/kde/kdm/Xresources
@@ -126,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 18 2007 Than Ngo <than@redhat.com> -  3.5-29
+- cleanup kde-setings, bz#242564
+
 * Mon May 21 2007 Than Ngo <than@redhat.com> - 3.5-28
 - don't hardcode locale in kdeglobals config
 - cleanup clock setting
diff --git a/sources b/sources
index 046475f..8934bd0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb418ab48a21759a90ef66448080fd23  kde-settings-3.5-28.tar.bz2
+f8d44b8940ac57daa13ae5e1fae25628  kde-settings-3.5-29.tar.bz2