rpms/kdelibs/devel kde4.csh, 1.3, 1.4 kde4.sh, 1.4, 1.5 kdelibs.spec, 1.478, 1.479

Rex Dieter rdieter at fedoraproject.org
Thu May 14 16:52:35 UTC 2009


Author: rdieter

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

Modified Files:
	kde4.csh kde4.sh kdelibs.spec 
Log Message:
- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)



Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/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	14 May 2009 16:52:04 -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/devel/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	14 May 2009 16:52:04 -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/devel/kdelibs.spec,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -p -r1.478 -r1.479
--- kdelibs.spec	14 May 2009 16:03:07 -0000	1.478
+++ kdelibs.spec	14 May 2009 16:52:04 -0000	1.479
@@ -402,6 +402,8 @@ rm -rf %{buildroot}
 %changelog
 * Tue May 12 2009 Than Ngo <than at redhat.com> 4.2.85-1
 - KDE-4.3 beta1 (4.2.85)
+- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
+
 
 * Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-14
 - -devel: Provides: kdelibs4-devel%%{?_isa} ...




More information about the fedora-extras-commits mailing list