2 files changed, 60 insertions, 9 deletions
diff --git a/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch b/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch
index e62d343a8..81a073d71 100644
--- a/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch
+++ b/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch
@@ -1,7 +1,11 @@
-diff -Nuar kdebluetooth.ORI/admin/acinclude.m4.in kdebluetooth.P/admin/acinclude.m4.in
---- kdebluetooth.ORI/admin/acinclude.m4.in	2012-02-12 14:10:33.093808915 +0100
-+++ kdebluetooth.P/admin/acinclude.m4.in	2012-02-12 14:13:57.437558226 +0100
-@@ -483,10 +483,10 @@
+--- a/admin/acinclude.m4.in.trinity	2007-09-05 18:30:55.000000000 +0200
++++ a/admin/acinclude.m4.in	2012-08-19 12:48:49.872571920 +0200
+@@ -479,14 +479,14 @@
+     if test "$kde_qtver" = "2"; then
+       kde_moduledir='\${libdir}/kde2'
+     else
+-      kde_moduledir='\${libdir}/kde3'
++      kde_moduledir='\${libdir}/trinity'
      fi
    fi
    if test -z "$kde_styledir"; then
@@ -14,6 +18,42 @@ diff -Nuar kdebluetooth.ORI/admin/acinclude.m4.in kdebluetooth.P/admin/acinclude
    fi
    if test -z "$xdg_appsdir"; then
      xdg_appsdir='\${datadir}/applications/kde'
+@@ -546,7 +546,7 @@
+ 
+ AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
+ [
+-    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
++    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
+     test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
+     if test -n "$KDEDIRS"; then
+        kde_save_IFS=$IFS
+@@ -612,7 +612,7 @@
+         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
+ 
+         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
+- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
++ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
+             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
+ 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
+@@ -1793,7 +1793,7 @@
+ 
+ if test -z "$1"; then
+ 
+-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
++kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
+ test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+ kde_incdirs="$ac_kde_includes $kde_incdirs"
+ AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
+@@ -1805,7 +1805,7 @@
+ So, check this please and use another prefix!])
+ fi
+ 
+-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
++kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+ test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+ kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
+ AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
 @@ -1813,7 +1813,7 @@
  
  kde_widgetdir=NO
diff --git a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
index a3c4e04c3..454eff149 100644
--- a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
+++ b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec
@@ -58,7 +58,9 @@ BuildRequires:	obexftp-devel
 %endif
 
 Requires:		%{name}-libs = %{version}-%{release}
-Requires:		trinity-kdesu
+
+# kdesu binary
+Requires:		trinity-tdebase-bin
 
 
 
@@ -134,8 +136,8 @@ export CXXFLAGS="${CXXFLAGS} -I%{tde_includedir}/dbus-1.0"
   --disable-debug			\
   --disable-dependency-tracking		\
   --enable-final				\
-  --enable-closure			\ 
-  --with-extra-includes=%{tde_includedir}/tqt:
+  --enable-closure			\
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags} LIBTOOL=$(which libtool)
 
@@ -168,6 +170,15 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
 rm -f ${RPM_BUILD_ROOT}%{tde_libdir}/*.a
 rm -f ${RPM_BUILD_ROOT}%{tde_libdir}/kde3/*.a
 
+%find_lang kdebluetooth
+
+# Unwanted files
+%__rm -f %{buildroot}%{tde_tdelibdir}/kcm_btpaired.a
+%__rm -f %{buildroot}%{tde_tdelibdir}/kio_bluetooth.a
+%__rm -f %{buildroot}%{tde_tdelibdir}/kio_obex.a
+%__rm -f %{buildroot}%{tde_tdelibdir}/kio_sdp.a
+%__rm -f %{buildroot}%{tde_datadir}/applnk/Settings/Network/Bluetooth/.directory
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -184,7 +195,7 @@ touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
-%files
+%files -f kdebluetooth.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING INSTALL README
 %{tde_bindir}/kblue*
@@ -224,7 +235,7 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %files devel
 %defattr(-,root,root,-)
-%{tde_includedir}/*
+%{tde_tdeincludedir}/*
 %{tde_libdir}/*.so