rpms/kde-settings/devel .cvsignore, 1.8, 1.9 kde-settings.spec, 1.10, 1.11 sources, 1.8, 1.9

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15242

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
sync w/F-7 branch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 May 2007 12:59:02 -0000	1.8
+++ .cvsignore	24 Jul 2007 21:59:45 -0000	1.9
@@ -3,3 +3,6 @@
 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
+kde-settings-3.5-30.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kde-settings.spec	18 May 2007 13:09:42 -0000	1.10
+++ kde-settings.spec	24 Jul 2007 21:59:45 -0000	1.11
@@ -1,16 +1,16 @@
 
-%define rel 27
+%define rel 30
 
 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
 # This is a package which is specific to our distribution.  
 # Thus the source is only available from within this srpm.
-Source0: kde-settings-%{version}-%{rel}.tar.gz
+Source0: kde-settings-%{version}-%{rel}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -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,18 @@
 
 
 %changelog
+* Mon Jul 02 2007 Than Ngo <than at redhat.com> -  3.5-30
+- fix bz#245100
+
+* 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
+- plastik as default colorscheme
+- use bzip2
+
 * Fri May 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-27
 - kdeglobals: [Icons] Theme = crystalsvg
 - kdeglobals: [Paths] Trash[$e]=$(xdg-user-dir DESKTOP)/Trash/


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 May 2007 12:59:02 -0000	1.8
+++ sources	24 Jul 2007 21:59:45 -0000	1.9
@@ -1,2 +1 @@
-1264e264235dd44c431d3e9f348dcc25  kde-settings-3.5-26.tar.gz
-606f0d879084d1d78588a66da0ab0c3c  kde-settings-3.5-27.tar.gz
+3591c492cebe4654f74cfb3b32b499e3  kde-settings-3.5-30.tar.bz2