rpms/kdelibs/devel kde4.csh, 1.1.2.5, 1.1.2.6 kde4.sh, 1.1.2.5, 1.1.2.6

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12747

Modified Files:
      Tag: kdelibs-kde4-branch
	kde4.csh kde4.sh 
Log Message:
make KDE_IS_PRELINKED conditional (again)



Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.csh,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- kde4.csh	20 Sep 2007 14:24:32 -0000	1.1.2.5
+++ kde4.csh	20 Sep 2007 14:39:45 -0000	1.1.2.6
@@ -5,19 +5,12 @@
 if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
 
 ## When/if using prelinking, avoids 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 not using IP6, speeds DNS operations
-# # if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1
-
-## fork io slaves from prog, not kdeinit.  may help selinux. (experimental)
-# don't enable until http://bugs.kde.org/88557 is fixed
-# if ( ! $?KDE_FORK_SLAVES ) setenv KDE_FORK_SLAVES 1
+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 ( ! $?QT_PLUGIN_PATH ) then
   set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.sh,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- kde4.sh	20 Sep 2007 14:24:32 -0000	1.1.2.5
+++ kde4.sh	20 Sep 2007 14:39:45 -0000	1.1.2.6
@@ -5,18 +5,11 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-#if [ -f /etc/sysconfig/prelink ]; then
-#  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
+if [ -f /etc/sysconfig/prelink ]; then
+  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
     [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-#  fi
-#fi
-
-## if not using IP6, speeds DNS operations
-# [ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6
-
-## fork io slaves from prog, not kdeinit. may help selinux (experimetal)
-# don't enable until http://bugs.kde.org/88557 is fixed
-# [ -z "$KDE_FORK_SLAVES" ] && KDE_FORK_SLAVES=1 && export KDE_FORK_SLAVES
+  fi
+fi
 
 if [ -z "$QT_PLUGIN_PATH" ]; then
   KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`