From c0c1a90179dd0f0e19549f279ee95cae7e577b82 Mon Sep 17 00:00:00 2001
From: Francois Andriot <francois.andriot@free.fr>
Date: Fri, 3 Aug 2012 21:34:00 +0200
Subject: RHEL/Fedora: some more updates for MGA2/MDV2011 building

---
 redhat/kdeaccessibility/kdeaccessibility-3.5.13-missing_ldflags.patch | 4 ++--
 redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'redhat/kdeaccessibility')

diff --git a/redhat/kdeaccessibility/kdeaccessibility-3.5.13-missing_ldflags.patch b/redhat/kdeaccessibility/kdeaccessibility-3.5.13-missing_ldflags.patch
index 5c7c7f2a3..e5caff9e3 100644
--- a/redhat/kdeaccessibility/kdeaccessibility-3.5.13-missing_ldflags.patch
+++ b/redhat/kdeaccessibility/kdeaccessibility-3.5.13-missing_ldflags.patch
@@ -5,7 +5,7 @@
  libKTTSD_Lib_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 0:1
  lib_LTLIBRARIES = libKTTSD_Lib.la
 -libKTTSD_Lib_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE)
-+libKTTSD_Lib_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt -lDCOP
++libKTTSD_Lib_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lDCOP
  noinst_HEADERS = kttsdlib.h kttsdlibsetupimpl.h kttsdlibtalker2.h kdeexportfix.h
  
  kspeech_DIR = $(KTTS_KSPEECH_DIR)
@@ -16,7 +16,7 @@
  
  libkttsd_la_LDFLAGS = -version-info 1:0:0 $(all_libraries) -no-undefined
 -libkttsd_la_LIBADD = $(LIB_KIO)
-+libkttsd_la_LIBADD = $(LIB_KIO) -lqt-mt -lkdeui -lkdecore
++libkttsd_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
  
  # Header files that should not be installed.
  noinst_HEADERS = \
diff --git a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec
index ac9095577..1e078db5b 100644
--- a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec
+++ b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec
@@ -460,6 +460,7 @@ export KDEDIRS=%{tde_prefix}
 export KDEDIR=%{tde_prefix}
 
 %configure \
+  --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
   --bindir=%{tde_bindir} \
   --libdir=%{tde_libdir} \
-- 
cgit v1.2.1