rpms/kdelibs/devel kde.csh,1.5,1.6 kde.sh,1.7,1.8

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Sep 20 14:38:08 UTC 2007


Author: rdieter

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

Modified Files:
	kde.csh kde.sh 
Log Message:
make KDE_IS_PRELINKED conditional (again)



Index: kde.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde.csh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kde.csh	3 Aug 2007 14:23:17 -0000	1.5
+++ kde.csh	20 Sep 2007 14:37:35 -0000	1.6
@@ -1,17 +1,17 @@
 ## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
 ## for possible entries here
 
+## Make sure KDEDIRS is set
+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
 
 ## if not using IPv6, speeds DNS operations
 # if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1 
 
-## Make sure KDEDIRS is set
-if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
-


Index: kde.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kde.sh	3 Aug 2007 14:23:17 -0000	1.7
+++ kde.sh	20 Sep 2007 14:37:35 -0000	1.8
@@ -1,15 +1,12 @@
 ## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
 ## for possible entries here
 
-## When/if using prelinking, avoids (some) use of kdeinit
-#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 IPv6, speeds DNS operations
-#[ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6
-
 ## Make sure KDEDIRS is set
 [ -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
+    [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
+  fi
+fi




More information about the scm-commits mailing list