jreznik pushed to kdelibs3 (epel7). "- move /etc/profile.d/kde.(sh|csh) to kde-settings (F-12+)"

[notifications at fedoraproject.org]

>From 59e8bfe7e19c6e354f69e6b8b96cd0f2510cc2bd Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed, 23 Sep 2009 19:39:16 +0000
Subject: - move /etc/profile.d/kde.(sh|csh) to kde-settings (F-12+)


diff --git a/kde.csh b/kde.csh
index 8b02aa8..ce0decf 100755
--- a/kde.csh
+++ b/kde.csh
@@ -5,10 +5,10 @@
 if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
 
 ##  When/if using prelinking, avoids (some) use of kdeinit
-#if ( -f /etc/sysconfig/prelink ) then
-#   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
-#   if ( "$PRELINKING" == "yes" )  then
-#     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
-#   endif
-#endif
+if ( -f /etc/sysconfig/prelink ) then
+   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
+   if ( "$PRELINKING" == "yes" )  then
+     if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+   endif
+endif
 
diff --git a/kde.sh b/kde.sh
index 0565ce2..e011555 100755
--- a/kde.sh
+++ b/kde.sh
@@ -5,7 +5,7 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-#if [ -z "$KDE_IS_PRELINKED" ] ; then
-#  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
-#  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-#fi
+if [ -z "$KDE_IS_PRELINKED" ] ; then
+  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
+  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
+fi
diff --git a/kdelibs3.spec b/kdelibs3.spec
index 01e69c4..d3e3b21 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -30,7 +30,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 16%{?dist}
+Release: 17%{?dist}
 
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
@@ -342,8 +342,10 @@ for i in *; do
 done
 popd
 
+%if 0%{?fedora} < 12
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
+%endif
 
 # Use hicolor-icon-theme rpm/pkg instead (#178319)
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
@@ -479,7 +481,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %defattr(-,root,root,-)
 %doc README
 %doc COPYING.LIB
+%if 0%{?fedora} < 12
 %config(noreplace) %{_sysconfdir}/profile.d/*
+%endif
 %{_bindir}/artsmessage
 %{_bindir}/cupsdconf
 %{_bindir}/cupsdoprint
@@ -576,6 +580,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-17 
+- move /etc/profile.d/kde.(sh|csh) to kde-settings (F-12+)
+
 * Fri Sep 04 2009 Than Ngo <than at redhat.com> - 3.5.10-16
 - openssl-1.0 build fixes
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=59e8bfe7e19c6e354f69e6b8b96cd0f2510cc2bd