From 39b93ce6be5b6d1ef6cc322f816b6f5173e715a3 Mon Sep 17 00:00:00 2001
From: Francois Andriot <francois.andriot@free.fr>
Date: Sat, 10 Dec 2011 00:49:35 +0100
Subject: RHEL/Fedora: fix minor packaging issues in amarok, tqscintilla

---
 redhat/applications/amarok/trinity-amarok.spec           | 2 +-
 redhat/components.txt                                    | 3 ++-
 redhat/dependencies/tqscintilla/trinity-tqscintilla.spec | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'redhat')

diff --git a/redhat/applications/amarok/trinity-amarok.spec b/redhat/applications/amarok/trinity-amarok.spec
index 35580490f..b307f19ce 100644
--- a/redhat/applications/amarok/trinity-amarok.spec
+++ b/redhat/applications/amarok/trinity-amarok.spec
@@ -17,7 +17,7 @@ BuildRequires:	cmake >= 2.8
 
 
 Name:    trinity-%{kdecomp}
-Summary: A drop-down terminal emulator.
+Summary: Media player
 Version: %{version}
 Release: %{release}%{?dist}%{?_variant}
 
diff --git a/redhat/components.txt b/redhat/components.txt
index 722f6b054..620d7ef06 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -11,7 +11,7 @@ dependencies/tqtinterface
 dependencies/dbus-tqt
 dependencies/dbus-1-tqt
 dependencies/arts
-#dependencies/tqscintilla
+dependencies/tqscintilla
 kdelibs
 kdebase
 kdebindings
@@ -31,6 +31,7 @@ kdeedu
 kdeaddons
 kdewebdev
 kde-i18n
+extras/kasablanca
 extras/ksensors
 extras/libkarma
 #extras/libkexif
diff --git a/redhat/dependencies/tqscintilla/trinity-tqscintilla.spec b/redhat/dependencies/tqscintilla/trinity-tqscintilla.spec
index c12858d36..3742b868f 100644
--- a/redhat/dependencies/tqscintilla/trinity-tqscintilla.spec
+++ b/redhat/dependencies/tqscintilla/trinity-tqscintilla.spec
@@ -123,9 +123,8 @@ for i in designer/*.so; do
 done
 
 # Installs libraries
-for i in tmplib/*; do 
-	%__install -D $i %{buildroot}%{_libdir}/${i##*/}
-done
+%__mkdir_p %{buildroot}%{_libdir}
+%__mv -f tmplib/* %{buildroot}%{_libdir}
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
-- 
cgit v1.2.1