rpms/kde-settings/devel .cvsignore, 1.65, 1.66 kde-settings.spec, 1.91, 1.92 sources, 1.67, 1.68

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28216

Modified Files:
	.cvsignore kde-settings.spec sources 
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-10
- include /etc/profile.d/kde.(sh|csh) here, renable KDE_IS_PRELINKED



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	21 Sep 2009 15:14:06 -0000	1.65
+++ .cvsignore	23 Sep 2009 22:45:16 -0000	1.66
@@ -1 +1 @@
-kde-settings-4.3-9.tar.bz2
+kde-settings-4.3-10.tar.bz2


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- kde-settings.spec	21 Sep 2009 15:14:06 -0000	1.91
+++ kde-settings.spec	23 Sep 2009 22:45:17 -0000	1.92
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F12 ONLY!
 
-%define rel 9
+%define rel 10
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -30,6 +30,9 @@ Requires(postun): coreutils
 
 Obsoletes: kde-config < %{version}-%{release}
 
+# when profile.d/kde.(sh|csh) was moved here
+Conflicts: kdelibs3 < 3.5.10-17
+
 %description
 %{summary}.
 
@@ -117,6 +120,7 @@ touch --no-create %{_datadir}/kde-settin
 
 %files 
 %defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/profile.d/kde.*
 %{_sysconfdir}/kde/env/env.sh
 %{_sysconfdir}/kde/env/gpg-agent*.sh
 %{_sysconfdir}/kde/env/fedora-bookmarks.sh
@@ -154,6 +158,9 @@ touch --no-create %{_datadir}/kde-settin
 
 
 %changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-10
+- include /etc/profile.d/kde.(sh|csh) here, renable KDE_IS_PRELINKED
+
 * Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3-9
 - kdmrc: ForceUserAuthDir=true (#524583)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	21 Sep 2009 15:14:06 -0000	1.67
+++ sources	23 Sep 2009 22:45:17 -0000	1.68
@@ -1 +1 @@
-0b05bc9755e2758cdf254c2ff9af8c2f  kde-settings-4.3-9.tar.bz2
+3bb6fe4ca1c41a0944a3d743094afd8f  kde-settings-4.3-10.tar.bz2