From 8d3297168779d613d90d0816b38bc5cae0e6d2dd Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 26 2014 08:52:27 +0000
Subject: import kde-settings-19-23.5.el7


---

diff --git a/SOURCES/kde-settings-19-23-bz#1124472.patch b/SOURCES/kde-settings-19-23-bz#1124472.patch
new file mode 100644
index 0000000..fa31ad9
--- /dev/null
+++ b/SOURCES/kde-settings-19-23-bz#1124472.patch
@@ -0,0 +1,16 @@
+diff -up kde-settings-19-23/etc/profile.d/kde.csh.orig kde-settings-19-23/etc/profile.d/kde.csh
+--- kde-settings-19-23/etc/profile.d/kde.csh.orig	2012-05-16 18:30:07.000000000 +0200
++++ kde-settings-19-23/etc/profile.d/kde.csh	2014-11-14 13:50:28.010509907 +0100
+@@ -21,3 +21,4 @@ endif
+ #endif
+ end
+ 
++unsetenv libdir
+diff -up kde-settings-19-23/etc/profile.d/kde.sh.orig kde-settings-19-23/etc/profile.d/kde.sh
+--- kde-settings-19-23/etc/profile.d/kde.sh.orig	2012-05-16 18:30:07.000000000 +0200
++++ kde-settings-19-23/etc/profile.d/kde.sh	2014-11-14 13:50:35.823455602 +0100
+@@ -21,3 +21,4 @@ fi
+ #fi
+ done
+ 
++unset libdir
diff --git a/SPECS/kde-settings.spec b/SPECS/kde-settings.spec
index db5dea3..5119574 100644
--- a/SPECS/kde-settings.spec
+++ b/SPECS/kde-settings.spec
@@ -1,5 +1,5 @@
 %global rel 23
-%global subrel 4
+%global subrel 5
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -10,8 +10,8 @@ License: MIT
 Url:     http://fedorahosted.org/kde-settings
 Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{version}-%{rel}.tar.xz
 Source1: COPYING
-Patch0 : kde-settings-19-23-rhel.patch
-
+Patch0: kde-settings-19-23-rhel.patch
+Patch1: kde-settings-19-23-bz#1124472.patch
 BuildArch: noarch
 
 BuildRequires: kde-filesystem
@@ -88,6 +88,7 @@ Requires: pciutils
 %prep
 %setup -q -n %{name}-%{version}-%{rel}
 %patch0 -p1
+%patch1 -p1
 
 %build
 # Intentionally left blank.  Nothing to see here.
@@ -121,6 +122,9 @@ rm -rf %{buildroot}%{_sysconfdir}/kde/kdm \
 
 %endif
 
+# fix permission
+chmod 644  %{buildroot}%{_sysconfdir}/profile.d/kde.*
+
 %files 
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/profile.d/kde.*
@@ -194,6 +198,9 @@ rm -rf %{buildroot}%{_sysconfdir}/kde/kdm \
 
 
 %changelog
+* Fri Nov 14 2014 Than Ngo <than@redhat.com> - 19-23.5
+- Resolves: bz#1124472,  shell namespace pollution
+
 * Thu Feb 27 2014 Than Ngo <than@redhat.com> - 19-23.4
 - exclude kdm