RHEL/Fedora: fix kdmtheme, kile, knemo HTML directory location

3 files changed, 19 insertions, 16 deletions

diff --git a/redhat/applications/kdmtheme/trinity-kdmtheme.spec b/redhat/applications/kdmtheme/trinity-kdmtheme.spec
index 74fadc821..05f4b43a5 100644
--- a/redhat/applications/kdmtheme/trinity-kdmtheme.spec
+++ b/redhat/applications/kdmtheme/trinity-kdmtheme.spec
@@ -52,8 +52,9 @@ that allows you to easily install, remove and change your KDM themes.
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-sed -i admin/acinclude.m4.in \
-  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+%__sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@@ -96,9 +97,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{tde_libdir}/kcm_kdmtheme.la
 %{tde_libdir}/kcm_kdmtheme.so
 %{_datadir}/applications/kde/kdmtheme.desktop
-%{_docdir}/HTML/en/kdmtheme/common
-%{_docdir}/HTML/en/kdmtheme/index.cache.bz2
-%{_docdir}/HTML/en/kdmtheme/index.docbook
+%{tde_docdir}/HTML/en/kdmtheme/common
+%{tde_docdir}/HTML/en/kdmtheme/index.cache.bz2
+%{tde_docdir}/HTML/en/kdmtheme/index.docbook
 %{_datadir}/lintian/overrides/kdmtheme-trinity
 
 
diff --git a/redhat/applications/kile/trinity-kile.spec b/redhat/applications/kile/trinity-kile.spec
index b79b45c11..a012fd69e 100644
--- a/redhat/applications/kile/trinity-kile.spec
+++ b/redhat/applications/kile/trinity-kile.spec
@@ -420,8 +420,9 @@ Kile can support large projects consisting of several smaller files.
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-sed -i admin/acinclude.m4.in \
-  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+%__sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@@ -476,31 +477,31 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/pixmaps/kile.xpm
 
 %files i18n-da
-%lang(da) %{_docdir}/HTML/da/kile
+%lang(da) %{tde_docdir}/HTML/da/kile
 %lang(da) %{_datadir}/locale/da/LC_MESSAGES/kile.mo
 
 %files i18n-es
-%lang(es) %{_docdir}/HTML/es/kile
+%lang(es) %{tde_docdir}/HTML/es/kile
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/kile.mo
 
 %files i18n-et
-%lang(et) %{_docdir}/HTML/et/kile
+%lang(et) %{tde_docdir}/HTML/et/kile
 %lang(et) %{_datadir}/locale/et/LC_MESSAGES/kile.mo
 
 %files i18n-it
-%lang(it) %{_docdir}/HTML/it/kile
+%lang(it) %{tde_docdir}/HTML/it/kile
 %lang(it) %{_datadir}/locale/it/LC_MESSAGES/kile.mo
 
 %files i18n-nl
-%lang(nl) %{_docdir}/HTML/nl/kile
+%lang(nl) %{tde_docdir}/HTML/nl/kile
 %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/kile.mo
 
 %files i18n-pt
-%lang(pt) %{_docdir}/HTML/pt/kile
+%lang(pt) %{tde_docdir}/HTML/pt/kile
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/kile.mo
 
 %files i18n-sv
-%lang(sv) %{_docdir}/HTML/sv/kile
+%lang(sv) %{tde_docdir}/HTML/sv/kile
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/kile.mo
 
 %files i18n-ar
diff --git a/redhat/applications/knemo/trinity-knemo.spec b/redhat/applications/knemo/trinity-knemo.spec
index 0f71d6799..4a26e682b 100644
--- a/redhat/applications/knemo/trinity-knemo.spec
+++ b/redhat/applications/knemo/trinity-knemo.spec
@@ -58,8 +58,9 @@ Homepage: http://extragear.kde.org/apps/knemo/
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-sed -i admin/acinclude.m4.in \
-  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+%__sed -i admin/acinclude.m4.in \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"