rpms/kdelibs/devel kde4.csh, 1.4, 1.5 kde4.sh, 1.5, 1.6 kdelibs.spec, 1.501, 1.502

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21073

Modified Files:
	kde4.csh kde4.sh kdelibs.spec 
Log Message:
* Fri Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
- kde4.(sh|csh): drop KDE_IS_PRELINKED for now (workaround bug #515539)



Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde4.csh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde4.csh	14 May 2009 16:52:04 -0000	1.4
+++ kde4.csh	14 Aug 2009 14:21:12 -0000	1.5
@@ -5,11 +5,11 @@
 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
-   unset PRELINKING
-endif
-
+## disabled, for now, due to http://bugzilla.redhat.com/515539
+#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
+#   unset PRELINKING
+#endif


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kde4.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kde4.sh	14 May 2009 16:52:04 -0000	1.5
+++ kde4.sh	14 Aug 2009 14:21:12 -0000	1.6
@@ -5,8 +5,8 @@
 [ -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
-
+## disabled, for now, due to http://bugzilla.redhat.com/515539
+#if [ -z "$KDE_IS_PRELINKED" ] ; then
+#  grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
+#  KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
+#fi


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -p -r1.501 -r1.502
--- kdelibs.spec	5 Aug 2009 18:25:22 -0000	1.501
+++ kdelibs.spec	14 Aug 2009 14:21:12 -0000	1.502
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -405,6 +405,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
+- kde4.(sh|csh): drop KDE_IS_PRELINKED for now (workaround bug #515539)
+
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
 - microblog crashes plasma on show friends toggle (kdebug#202550)
 - khtml crasher (kdebug#199557)