summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kio-locate
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/kio-locate')
-rw-r--r--redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch24
-rw-r--r--redhat/applications/kio-locate/trinity-kio-locate.spec7
2 files changed, 25 insertions, 6 deletions
diff --git a/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch
index 2f08804da..00ca8561c 100644
--- a/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch
+++ b/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch
@@ -9,9 +9,27 @@
obj.execute()
# Install the protocol files
---- kio-locate/admin/kde.py.ORI 2012-05-02 00:37:55.095993387 +0200
-+++ kio-locate/admin/kde.py 2012-05-02 00:38:34.615142101 +0200
-@@ -781,7 +781,7 @@
+--- kio-locate/admin/kde.py.install 2011-07-07 08:10:05.000000000 +0200
++++ kio-locate/admin/kde.py 2012-05-06 20:29:48.236024293 +0200
+@@ -337,7 +337,7 @@
+ opts.Save(cachefile, env)
+
+ ## set default variables, one can override them in sconscript files
+- env.Append(CXXFLAGS = ['-I'+env['KDEINCLUDEPATH'], '-I'+env['QTINCLUDEPATH'], '-I/usr/include/tqt' ],
++ env.Append(CXXFLAGS = ['-I'+env['KDEINCLUDEPATH'], '-I'+env['QTINCLUDEPATH'], '-I/opt/trinity/include/tqt' ],
+ LIBPATH = [env['KDELIBPATH'], env['QTLIBPATH'] ])
+
+ env['QT_AUTOSCAN'] = 1
+@@ -773,7 +773,7 @@
+ ## Define this to 1 if you are writing documentation else to 0 :)
+ #if lenv.has_key('i_am_a_documentation_writer'):
+ for file in docbook_list:
+- lenv.Depends( folder+'index.cache.bz2', nodefile )
++ lenv.Depends( folder+'index.cache.bz2', file )
+
+ if lenv.has_key('_BUILDDIR_'): folder=lenv.join(lenv['_BUILDDIR_'], folder)
+
+@@ -781,7 +782,7 @@
lenv.KDEinstall( 'KDEDOC', lenv.join(lang,destination), lenv.join(folder,'index.cache.bz2') )
if env['_INSTALL']:
diff --git a/redhat/applications/kio-locate/trinity-kio-locate.spec b/redhat/applications/kio-locate/trinity-kio-locate.spec
index 7f43664d0..8c0677730 100644
--- a/redhat/applications/kio-locate/trinity-kio-locate.spec
+++ b/redhat/applications/kio-locate/trinity-kio-locate.spec
@@ -6,7 +6,7 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
%endif
# TDE 3.5.13 specific building variables
@@ -54,11 +54,11 @@ as a directory.
%prep
%setup -q -n applications/%{kdecomp}
-%patch1 -p1
+%patch1 -p1 -b .install
# Ugly hack to modify TQT include directory inside SCONS files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/kde.py \
+%__sed -i "admin/kde.py" \
-e "s|/usr/include/tqt|%{_includedir}/tqt|g"
@@ -85,6 +85,7 @@ scons install DESTDIR=%{buildroot}
%doc AUTHORS ChangeLog COPYING TODO
%{tde_libdir}/kio_locate.la
%{tde_libdir}/kio_locate.so
+%{tde_docdir}/HTML/en/kio-locate/common
%{tde_docdir}/HTML/en/kio-locate/index.cache.bz2
%{tde_docdir}/HTML/en/kio-locate/index.docbook
%{tde_docdir}/HTML/en/kio-locate/screenshot.png