rpms/kde-settings/devel .cvsignore, 1.2, 1.3 kde-settings.spec, 1.1, 1.2 sources, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue May 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-21
- kiosk-style configs (finally)
- kdm use UserLists, FedoraFlyingHigh color scheme (#239701) 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 May 2007 13:52:41 -0000	1.2
+++ .cvsignore	15 May 2007 15:56:24 -0000	1.3
@@ -1 +1,2 @@
 kde-settings-3.5-17.tar.gz
+kde-settings-3.5-21.tar.gz


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde-settings.spec	15 May 2007 13:52:41 -0000	1.1
+++ kde-settings.spec	15 May 2007 15:56:24 -0000	1.2
@@ -2,13 +2,13 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 3.5
-Release: 20%{?dist}
+Release: 21%{?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}-17.tar.gz
+Source0: kde-settings-%{version}-21.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -38,32 +38,25 @@
 %prep
 %setup -q -c -n %{name}
 
-# Use Bluecurve Theme if available, do hacks here so we can keep 
-# a single tar/source file for all releases. -- Rex
-%if 0%{?fedora} > 3  || 0%{?rhel} > 4
+# fc6+ uses FedoraDNA
+%if 0%{?fedora} > 5 
 sed -i \
-  -e "s|^#Theme=.*|Theme=%{_datadir}/apps/kdm/themes/Bluecurve|" \
-  -e "s|^Theme=.*|Theme=%{_datadir}/apps/kdm/themes/Bluecurve|" \
-  -e "s|^#UseTheme=.*|UseTheme=true|" \
-  -e "s|^UseTheme=.*|UseTheme=true|" \
-  etc/kde/kdm/kdmrc 
-sed -i \
-  -e "s|^#Theme=.*|Theme=Bluecurve|" \
-  -e "s|^Theme=.*|Theme=Bluecurve|" \
-  usr/share/config/ksplashrc
+  -e "s|^Theme=.*|Theme=%{_datadir}/apps/kdm/themes/FedoraDNA|" \
+  etc/kde/kdm/kdmrc
 %endif
 
-# or better yet, FedoraDNA
-%if 0%{?fedora} > 5
+# fc7 uses FedoraFlyingHigh
+%if 0%{?fedora} > 6
 sed -i \
-  -e "s|^#Theme=.*|Theme=%{_datadir}/apps/kdm/themes/FedoraDNA|" \
-  -e "s|^Theme=.*|Theme=%{_datadir}/apps/kdm/themes/FedoraDNA|" \
-  -e "s|^#UseTheme=.*|UseTheme=true|" \
-  -e "s|^UseTheme=.*|UseTheme=true|" \
+  -e "s|^ColorScheme=.*|ColorScheme=FedoraFlyingHigh|" \
+  -e "s|^Theme=.*|Theme=%{_datadir}/apps/kdm/themes/FedoraFlyingHigh|" \
   etc/kde/kdm/kdmrc
 %endif
 
 
+
+
+
 %build
 # Intentionally left blank.  Nothing to see here.
 
@@ -120,12 +113,12 @@
 
 
 
-%files -f %{name}.list
+%files 
 %defattr(-,root,root,-)
 %{_sysconfdir}/skel/.kde/
-%config(noreplace) %{_sysconfdir}/kderc
-# belongs in -kdm below
-%exclude %{_datadir}/config/kdm
+# drop noreplace, so we can be sure to get the new kiosk bits
+%config %{_sysconfdir}/kderc
+%{_datadir}/kde-settings/
 
 %files kdm
 %defattr(-,root,root,-)
@@ -148,6 +141,10 @@
 
 
 %changelog
+* Tue May 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-21
+- kiosk-style configs (finally)
+- kdm use UserLists, FedoraFlyingHigh color scheme (#239701) 
+
 * Tue May 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-20
 - don't mix tab/spaces
 - %%setup -q


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 May 2007 13:52:41 -0000	1.2
+++ sources	15 May 2007 15:56:24 -0000	1.3
@@ -1 +1 @@
-0b29cff097697e48cb63f9e08c9c15f9  kde-settings-3.5-17.tar.gz
+755492eddf7e84163c10035831b31f94  kde-settings-3.5-21.tar.gz