From fa306c8efcd2aaf30f799bca1fd2c0a23328215c Mon Sep 17 00:00:00 2001
From: Francois Andriot <francois.andriot@free.fr>
Date: Sun, 4 Dec 2011 12:07:32 +0100
Subject: RHEL/Fedora: fix ktuberling failure

---
 .../kdegames-3.5.13-ktuberling_fail_load_picture.patch    | 11 +++++++++++
 redhat/kdegames/trinity-kdegames-3.5.13.spec              | 15 +++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 redhat/kdegames/kdegames-3.5.13-ktuberling_fail_load_picture.patch

(limited to 'redhat/kdegames')

diff --git a/redhat/kdegames/kdegames-3.5.13-ktuberling_fail_load_picture.patch b/redhat/kdegames/kdegames-3.5.13-ktuberling_fail_load_picture.patch
new file mode 100644
index 000000000..52fecb052
--- /dev/null
+++ b/redhat/kdegames/kdegames-3.5.13-ktuberling_fail_load_picture.patch
@@ -0,0 +1,11 @@
+--- kdegames/ktuberling/toplevel.cpp.ORI	2011-12-04 05:49:35.462097224 -0500
++++ kdegames/ktuberling/toplevel.cpp	2011-12-04 05:49:38.089040247 -0500
+@@ -189,7 +189,7 @@
+ // Load the layouts file
+ bool TopLevel::loadLayout(TQDomDocument &layoutDocument)
+ {
+-  TQFile layoutFile(TQFile::encodeName(locate("data", "ktuberling/pics/tqlayout.xml")));
++  TQFile layoutFile(TQFile::encodeName(locate("data", "ktuberling/pics/layout.xml")));
+   if (!layoutFile.open(IO_ReadOnly))
+      return false;
+ 
diff --git a/redhat/kdegames/trinity-kdegames-3.5.13.spec b/redhat/kdegames/trinity-kdegames-3.5.13.spec
index 1595a17f5..a3d0206a3 100644
--- a/redhat/kdegames/trinity-kdegames-3.5.13.spec
+++ b/redhat/kdegames/trinity-kdegames-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 2
+%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -32,7 +32,10 @@ URL:		http://www.trinitydesktop.org/
 Prefix:    %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source: kdegames-%{version}.tar.gz
+Source: 	kdegames-%{version}.tar.gz
+
+# [kdegames/ktuberling] Fix ktuberling pictures loading
+Patch0:		kdegames-3.5.13-ktuberling_fail_load_picture.patch
 
 Provides: kdegames3 = %{version}-%{release}
 
@@ -72,6 +75,7 @@ License: LGPLv2
 
 %prep
 %setup -q -n kdegames
+%patch0 -p1
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -89,10 +93,6 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
-%if 0%{?fedora} > 0
-export CXXFLAGS="${CXXFLAGS} -lkio"
-%endif
-
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -192,6 +192,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Fix ktuberling picture loading [TDE Bug #638]
+
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
 - Fix HTML directory location
 
-- 
cgit v1.2.1