From a5e92a90729b5e778dfdb4f444d1398f5e9d2301 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Fri, 9 Jan 2009 15:43:38 +0000
Subject: [PATCH] * Fri Jan 09 2009 Rex Dieter <rdieter@fedoraproject.org> -
 4.1.96-4 - bump min deps (cmake, kde-filesystem, phonon) - kde.(sh|csh):
 cleanup QT_PLUGIN_PATH handling - Requires: coreutils grep

---
 kde4.csh     | 13 ++++++++++---
 kde4.sh      | 12 +++++++++---
 kdelibs.spec | 22 ++++++++++++++++------
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/kde4.csh b/kde4.csh
index 15b92c9..c5e839f 100755
--- a/kde4.csh
+++ b/kde4.csh
@@ -10,9 +10,16 @@ if ( -f /etc/sysconfig/prelink ) then
    if ( "$PRELINKING" == "yes" )  then
      if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
    endif
+   unset PRELINKING
 endif
 
-if ( ! $?QT_PLUGIN_PATH ) then
-  set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
-  setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
+# 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 5a8075f..879316a 100755
--- a/kde4.sh
+++ b/kde4.sh
@@ -11,7 +11,13 @@ if [ -f /etc/sysconfig/prelink ]; then
   fi
 fi
 
-if [ -z "$QT_PLUGIN_PATH" ]; then
-  KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`
-  QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH
+# 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 0e6935d..1a80ad0 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -27,10 +27,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %endif
 
 BuildRequires: kde4-macros(api) >= 2
-BuildRequires: kde-filesystem >= 4
+BuildRequires: kde-filesystem >= 4-23
+# used in kde.(sh|csh)
+Requires: coreutils grep
+# dbus-launch needed here? don't think so, but be safe and keep 
+# for now -- Rex
 Requires: dbus-x11
 Requires: hicolor-icon-theme
-Requires: kde-filesystem >= 4
+Requires: kde-filesystem >= 4-23
 Requires: kde-settings
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: shared-mime-info
@@ -40,6 +44,7 @@ Requires: kdelibs-common
 %if 0%{?fedora} >= 9
 Requires: hunspell
 %endif
+Requires: phonon >= 4.2.96
 Requires: soprano >= 2.1.64
 
 Source1: kde4.sh
@@ -89,7 +94,7 @@ BuildRequires: aspell-devel
 BuildRequires: automoc
 BuildRequires: avahi-devel
 BuildRequires: bzip2-devel
-BuildRequires: cmake >= 2.6.2
+BuildRequires: cmake >= 2.6.2-3
 BuildRequires: cups-devel cups
 BuildRequires: enchant-devel
 BuildRequires: gamin-devel
@@ -107,7 +112,7 @@ BuildRequires: libxslt-devel libxml2-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
-BuildRequires: phonon-devel >= 4.2
+BuildRequires: phonon-devel >= 4.2.96
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= 2.1.64
 BuildRequires: strigi-devel >= 0.5.9
@@ -145,11 +150,11 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
 %endif
-Requires: cmake >= 2.6.2
+Requires: cmake >= 2.6.2-3
 Requires: automoc
 Requires: qt4-devel
 Requires: openssl-devel
-Requires: phonon-devel >= 4.2
+Requires: phonon-devel >= 4.2.96
 Requires: strigi-devel
 Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-devel
 %{?x_deps:Requires: %{x_deps}}
@@ -360,6 +365,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 09 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.1.96-4
+- bump min deps (cmake, kde-filesystem, phonon)
+- kde.(sh|csh): cleanup QT_PLUGIN_PATH handling
+- Requires: coreutils grep
+
 * Fri Jan 09 2009 Than Ngo <than@redhat.com> - 4.1.96-3
 - BR soprano >= 2.1.64