rpms/kdelibs/devel kde4.csh, 1.1.2.3, 1.1.2.4 kde4.sh, 1.1.2.3, 1.1.2.4 kdelibs.spec, 1.223.2.20, 1.223.2.21

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
      Tag: kdelibs-kde4-branch
	kde4.csh kde4.sh kdelibs.spec 
Log Message:
- actually install kde4.sh and kde4.csh
- sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3 (workaround for #244065 no longer needed, fixed in 3.93.0)


Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.csh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- kde4.csh	13 Sep 2007 04:50:36 -0000	1.1.2.3
+++ kde4.csh	13 Sep 2007 08:04:47 -0000	1.1.2.4
@@ -5,7 +5,12 @@
 if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
 
 ## When/if using prelinking, avoids use of kdeinit
-if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 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 not using IP6, speeds DNS operations
 # # if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.sh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- kde4.sh	13 Sep 2007 04:50:36 -0000	1.1.2.3
+++ kde4.sh	13 Sep 2007 08:04:47 -0000	1.1.2.4
@@ -5,7 +5,11 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-[ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
+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


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.20
retrieving revision 1.223.2.21
diff -u -r1.223.2.20 -r1.223.2.21
--- kdelibs.spec	13 Sep 2007 04:50:36 -0000	1.223.2.20
+++ kdelibs.spec	13 Sep 2007 08:04:47 -0000	1.223.2.21
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -166,6 +166,9 @@
 done
 popd
 
+install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
+install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
+
 
 %post
 /sbin/ldconfig ||:
@@ -186,6 +189,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO
 %doc COPYING COPYING-DOCS COPYING.LIB
+%config(noreplace) %{_sysconfdir}/profile.d/*
 %{_kde4_bindir}/*
 %exclude %{_kde4_bindir}/kconfig_compiler4
 %{_kde4_appsdir}/*
@@ -222,6 +226,11 @@
 
 
 %changelog
+* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-7
+- actually install kde4.sh and kde4.csh
+- sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3
+  (workaround for #244065 no longer needed, fixed in 3.93.0)
+
 * Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-6
 - set QT_PLUGIN_PATH in kde4.sh and kde4.csh