* Tue May 12 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.3-3

- kde4.(sh|csh): drop QT_PLUGINS_PATH munging, kde4-config call (#498809)
This commit is contained in:
Rex Dieter 2009-05-12 17:04:16 +00:00
parent a8865794f2
commit 226ac40f22
4 changed files with 5 additions and 23 deletions

View File

@ -1 +1 @@
kdelibs-4.2.2.tar.bz2
kdelibs-4.2.3.tar.bz2

View File

@ -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

11
kde4.sh
View File

@ -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

View File

@ -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@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@redhat.com> - 4.2.3-2
- better fix for strcasestr detection