rpms/kde-settings/F-9 .cvsignore, 1.34, 1.35 kde-settings.spec, 1.47, 1.48 sources, 1.33, 1.34

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13431/F-9

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Thu May 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0-22
- kdmrc: TerminateServer=true hack until Xserver fixed properly (#443320)
- %post kdm: don't try to use old kde3 kdm themes (#444730)
- add/fix scriptlet deps



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-9/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	18 Apr 2008 16:59:02 -0000	1.34
+++ .cvsignore	1 May 2008 13:57:13 -0000	1.35
@@ -1 +1 @@
-kde-settings-4.0-21.tar.bz2
+kde-settings-4.0-22.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-9/kde-settings.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kde-settings.spec	18 Apr 2008 16:59:02 -0000	1.47
+++ kde-settings.spec	1 May 2008 13:57:13 -0000	1.48
@@ -1,7 +1,7 @@
 # THIS SPECFILE IS FOR F9+ ONLY!
 # Sorry, it is just too different for conditionals to be worth it.
 
-%define rel 21
+%define rel 22
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -16,6 +16,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
+BuildRequires: kde-filesystem
+
 Requires: kde-filesystem
 # default (ok, inherited) icon theme
 Requires: oxygen-icon-theme
@@ -23,10 +25,13 @@
 Requires: pam
 Requires: xdg-user-dirs
 # sed/kill used in gpg-agent-(startup/shutdown).sh
-Requires: fileutils util-linux
+Requires: coreutils sed util-linux
 # Fedora_Waves theme for wallpaper
 Requires: desktop-backgrounds-basic
 
+Requires(post): coreutils
+Requires(postun): coreutils
+
 Obsoletes: kde-config < %{version}-%{release}
 
 %description
@@ -39,6 +44,9 @@
 Requires: fedorawaves-kdm-theme
 #Requires: kdebase-workspace
 Requires: xorg-x11-xdm
+Requires(pre): coreutils
+Requires(post): coreutils grep sed
+Requires(post): kde4-macros(api) = %{_kde4_macros_api}
 %description kdm
 %{summary}.
 
@@ -99,6 +107,12 @@
 # handle move from /etc/X11/xdm/kdmrc to /etc/kde/kdm/kdmrc
 [ ! -f %{_sysconfdir}/kde/kdm/kdmrc -a -f %{_sysconfdir}/kde/kdm/kdmrc.rpmnew ] && \
   %{__cp} -a %{_sysconfdir}/kde/kdm/kdmrc.rpmnew %{_sysconfdir}/kde/kdm/kdmrc ||:
+# kdm v3 themes don't work (#444730)
+# this hack assumes %_datadir != %_kde4_datadir
+(grep "^Theme=%{_datadir}/apps/kdm/themes/" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && \
+ sed -i -e "s|^Theme=%{_datadir}/apps/kdm/themes/.*|Theme=%{_kde4_datadir}/apps/kdm/themes/FedoraWaves|" \
+ %{_sysconfdir}/kde/kdm/kdmrc
+) ||:
 
 
 %files 
@@ -139,6 +153,11 @@
 
 
 %changelog
+* Thu May 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0-22
+- kdmrc: TerminateServer=true hack until Xserver fixed properly (#443320)
+- %%post kdm: don't try to use old kde3 kdm themes (#444730)
+- add/fix scriptlet deps
+
 * Fri Apr 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0-21
 - kglobalshortsrc: add keyboard shortcuts for Virtual desktop switching (#440415)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-9/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	18 Apr 2008 16:59:02 -0000	1.33
+++ sources	1 May 2008 13:57:13 -0000	1.34
@@ -1 +1 @@
-ab12ea52aec5bdd6c33d2c33b28bc592  kde-settings-4.0-21.tar.bz2
+e511f99250e5daa59a6ee84266d59345  kde-settings-4.0-22.tar.bz2