rpms/kdelibs/F-11 kde4-QT_PLUGIN_PATH.csh, NONE, 1.1 kde4-QT_PLUGIN_PATH.sh, NONE, 1.1 kde4.csh, 1.3, 1.4 kde4.sh, 1.4, 1.5 kdelibs.spec, 1.477, 1.478

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19782

Modified Files:
	kde4.csh kde4.sh kdelibs.spec 
Added Files:
	kde4-QT_PLUGIN_PATH.csh kde4-QT_PLUGIN_PATH.sh 
Log Message:
* Tue May 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-3
- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)



--- NEW FILE kde4-QT_PLUGIN_PATH.csh ---

## handled in startkde, but this sets for other DE's too
if ( $?QT_PLUGIN_PATH ) then
# set KDE4_QTPLUGINS=`kde4-config --path qtplugins`
  set KDE4_QTPLUGINS="/usr/lib64/kde4/plugins:/usr/lib/kde4/plugins"
  if ( "$QT_PLUGIN_PATH" !~ *"${KDE4_QTPLUGINS}"* ) then
    setenv QT_PLUGIN_PATH ${QT_PLUGIN_PATH}:${KDE4_QTPLUGINS}
  endif 
else
  setenv QT_PLUGIN_PATH ${KDE4_QTPLUGINS} 
endif
unset KDE4_QTPLUGINS



--- NEW FILE kde4-QT_PLUGIN_PATH.sh ---

## handled in startkde, but this sets for other DE's too
if [ -n "$QT_PLUGIN_PATH" ] ; then
# KDE4_QTPLUGINS=`kde4-config --path qtplugins`
  KDE4_QTPLUGINS="/usr/lib64/kde4/plugins:/usr/lib/kde4/plugins"
  if ! echo "$QT_PLUGIN_PATH" | grep -qw $KDE4_QTPLUGINS ; then
    QT_PLUGIN_PATH="$QT_PLUGIN_PATH:$KDE4_QTPLUGINS"
  fi
else
  QT_PLUGIN_PATH="$KDE4_QTPLUGINS"
fi
unset  KDE4_QTPLUGINS 
export QT_PLUGIN_PATH



Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kde4.csh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kde4.csh	9 Jan 2009 15:43:38 -0000	1.3
+++ kde4.csh	12 May 2009 15:49:36 -0000	1.4
@@ -13,13 +13,3 @@ if ( -f /etc/sysconfig/prelink ) then
    unset PRELINKING
 endif
 
-# handled in startkde, but this sets for other DE's too
-set KDE4_QTPLUGINS=`kde4-config --path qtplugins`
-if ( $?QT_PLUGIN_PATH ) then
-  if ( "$QT_PLUGIN_PATH" !~ *"${KDE4_QTPLUGINS}"* ) then
-    setenv QT_PLUGIN_PATH ${QT_PLUGIN_PATH}:${KDE4_QTPLUGINS}
-  endif 
-else
-  setenv QT_PLUGIN_PATH ${KDE4_QTPLUGINS} 
-endif
-unset KDE4_QTPLUGINS


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kde4.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde4.sh	12 Jan 2009 20:34:52 -0000	1.4
+++ kde4.sh	12 May 2009 15:49:36 -0000	1.5
@@ -10,14 +10,3 @@ if [ -z "$KDE_IS_PRELINKED" ] ; then
   KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
 fi
 
-
-# handled in startkde, but this sets for other DE's too
-if [ -n "$QT_PLUGIN_PATH" ] ; then
-  if ! echo "$QT_PLUGIN_PATH" | grep -qw `kde4-config --path qtplugins` ; then
-    QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
-  fi
-else
-  QT_PLUGIN_PATH="`kde4-config --path qtplugins`"
-fi
-export QT_PLUGIN_PATH
-


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -p -r1.477 -r1.478
--- kdelibs.spec	5 May 2009 09:02:01 -0000	1.477
+++ kdelibs.spec	12 May 2009 15:49:36 -0000	1.478
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -407,6 +407,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue May 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-3
+- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
+
 * Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-2
 - better fix for strcasestr detection