rpms/kde-settings/F-7 .cvsignore, 1.9, 1.10 kde-settings.spec, 1.10, 1.11 sources, 1.9, 1.10

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kde-settings/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14091

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
- cleanup kde-setings, bz#242564




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 May 2007 09:18:49 -0000	1.9
+++ .cvsignore	18 Jun 2007 15:36:42 -0000	1.10
@@ -4,3 +4,4 @@
 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


Index: kde-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/F-7/kde-settings.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kde-settings.spec	21 May 2007 09:18:49 -0000	1.10
+++ kde-settings.spec	18 Jun 2007 15:36:42 -0000	1.11
@@ -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 @@
 %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 @@
 %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 @@
 
 
 %changelog
+* Mon Jun 18 2007 Than Ngo <than at redhat.com> -  3.5-29
+- cleanup kde-setings, bz#242564
+
 * Mon May 21 2007 Than Ngo <than at redhat.com> - 3.5-28
 - don't hardcode locale in kdeglobals config
 - cleanup clock setting


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kde-settings/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 May 2007 09:18:49 -0000	1.9
+++ sources	18 Jun 2007 15:36:42 -0000	1.10
@@ -1 +1 @@
-fb418ab48a21759a90ef66448080fd23  kde-settings-3.5-28.tar.bz2
+f8d44b8940ac57daa13ae5e1fae25628  kde-settings-3.5-29.tar.bz2