rpms/kde-settings/devel .cvsignore, 1.10, 1.11 kde-settings.spec, 1.12, 1.13 sources, 1.10, 1.11

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Tue Oct 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5-32
- f8: Requires: fedorainfinity-kdm-theme (#314041)
      kdmrc: [X-*-Greeter] Theme=.../FedoraInfinity
      kdmrc: [X-*-Greeter] ColorScheme=FedoraInfinity



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Sep 2007 17:29:59 -0000	1.10
+++ .cvsignore	2 Oct 2007 18:17:24 -0000	1.11
@@ -1,4 +1,4 @@
 etc/
 usr/
-kde-settings-3.5-30.tar.bz2
 kde-settings-3.5-31.tar.bz2
+kde-settings-3.5-32.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kde-settings.spec	26 Sep 2007 17:29:59 -0000	1.12
+++ kde-settings.spec	2 Oct 2007 18:17:24 -0000	1.13
@@ -1,5 +1,5 @@
 
-%define rel 31
+%define rel 32
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -27,11 +27,14 @@
 Group:	 System Environment/Base
 Obsoletes: kde-config-kdm < %{version}-%{release}
 Requires: kdebase-kdm >= %{version}
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
-Requires: redhat-artwork-kde
-%else
-Requires: redhat-artwork
+%define kdm_theme redhat-artwork
+%if 0%{?fedora} == 8
+%define kdm_theme fedorainfinity-kdm-theme
 %endif
+%if 0%{?fedora} == 7
+%define kdm_theme redhat-artwork-kde
+%endif
+Requires: %{kdm_theme}
 Requires: xorg-x11-xdm
 %description kdm
 %{summary}.
@@ -102,6 +105,11 @@
 
 
 %changelog
+* Tue Oct 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5-32
+- f8: Requires: fedorainfinity-kdm-theme (#314041)
+      kdmrc: [X-*-Greeter] Theme=.../FedoraInfinity
+      kdmrc: [X-*-Greeter] ColorScheme=FedoraInfinity
+
 * Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5-31
 - kdesktoprc: [Desktop0] Wallpaper=/usr/share/backgrounds/images/default.png
   (#290571)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Sep 2007 17:29:59 -0000	1.10
+++ sources	2 Oct 2007 18:17:24 -0000	1.11
@@ -1 +1 @@
-007b2d8ca128a5db76aa72257265c0ed  kde-settings-3.5-31.tar.bz2
+1e0bd37f14ade337343a2e3cfab8d577  kde-settings-3.5-32.tar.bz2