rpms/kdelibs/F-10 .cvsignore, 1.64, 1.65 kde4.csh, 1.3, 1.4 kde4.sh, 1.3, 1.4 kdelibs.spec, 1.426, 1.427

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kde4.csh kde4.sh kdelibs.spec 
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)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	1 Apr 2009 17:50:32 -0000	1.64
+++ .cvsignore	12 May 2009 17:04:16 -0000	1.65
@@ -1 +1 @@
-kdelibs-4.2.2.tar.bz2
+kdelibs-4.2.3.tar.bz2


Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kde4.csh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kde4.csh	23 Jan 2009 18:59:58 -0000	1.3
+++ kde4.csh	12 May 2009 17:04:16 -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-10/kde4.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kde4.sh	23 Jan 2009 18:59:58 -0000	1.3
+++ kde4.sh	12 May 2009 17:04:16 -0000	1.4
@@ -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-10/kdelibs.spec,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -p -r1.426 -r1.427
--- kdelibs.spec	5 May 2009 09:30:33 -0000	1.426
+++ kdelibs.spec	12 May 2009 17:04:16 -0000	1.427
@@ -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