rpms/kdelibs/devel kde4.csh, 1.1.2.2, 1.1.2.3 kde4.sh, 1.1.2.2, 1.1.2.3 kdelibs.spec, 1.223.2.19, 1.223.2.20

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
      Tag: kdelibs-kde4-branch
	kde4.csh kde4.sh kdelibs.spec 
Log Message:
set QT_PLUGIN_PATH in kde4.sh and kde4.csh


Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.csh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- kde4.csh	3 Aug 2007 18:19:59 -0000	1.1.2.2
+++ kde4.csh	13 Sep 2007 04:50:36 -0000	1.1.2.3
@@ -14,3 +14,7 @@
 # don't enable until http://bugs.kde.org/88557 is fixed
 # if ( ! $?KDE_FORK_SLAVES ) setenv KDE_FORK_SLAVES 1
 
+if ( ! $?QT_PLUGIN_PATH ) then
+  set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
+  setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
+endif


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.sh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- kde4.sh	3 Aug 2007 18:19:59 -0000	1.1.2.2
+++ kde4.sh	13 Sep 2007 04:50:36 -0000	1.1.2.3
@@ -14,3 +14,7 @@
 # don't enable until http://bugs.kde.org/88557 is fixed
 # [ -z "$KDE_FORK_SLAVES" ] && KDE_FORK_SLAVES=1 && export KDE_FORK_SLAVES
 
+if [ -z "$QT_PLUGIN_PATH" ]; then
+  KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`
+  QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH
+fi


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.19
retrieving revision 1.223.2.20
diff -u -r1.223.2.19 -r1.223.2.20
--- kdelibs.spec	12 Sep 2007 09:51:29 -0000	1.223.2.19
+++ kdelibs.spec	13 Sep 2007 04:50:36 -0000	1.223.2.20
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -222,6 +222,9 @@
 
 
 %changelog
+* 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
+
 * Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-5
 - fix strange coloring due to incomplete changes to KColorScheme