diff --git a/.cvsignore b/.cvsignore index cf84b0b..d33586f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdelibs-4.2.2.tar.bz2 +kdelibs-4.2.3.tar.bz2 diff --git a/kde4.csh b/kde4.csh index c5e839f..0a464b1 100755 --- a/kde4.csh +++ b/kde4.csh @@ -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 diff --git a/kde4.sh b/kde4.sh index 59edb00..a4662f8 100755 --- a/kde4.sh +++ b/kde4.sh @@ -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 - diff --git a/kdelibs.spec b/kdelibs.spec index a70b5fc..f5933fb 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -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 - 4.2.3-3 +- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809) + * Mon May 04 2009 Than Ngo - 4.2.3-2 - better fix for strcasestr detection