RHEL/Fedora: fix koffice, tellico, piklab, ktechlab HTML Directory location

Add kvirc.

8 files changed, 261 insertions, 33 deletions

diff --git a/redhat/applications/koffice/trinity-koffice.spec b/redhat/applications/koffice/trinity-koffice.spec
index aa0fe2321..17a6329c4 100644
--- a/redhat/applications/koffice/trinity-koffice.spec
+++ b/redhat/applications/koffice/trinity-koffice.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp koffice
 %define version 1.6.3
-%define release 1
+%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -289,8 +289,9 @@ sed -i.dejavu-lgc \
 
 # 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"
@@ -329,7 +330,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 %__install -p -D -m644 %{SOURCE100} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/koshell.png
 
 # Replace absolute symlinks with relative ones
-pushd %{buildroot}%{_docdir}/HTML
+pushd %{buildroot}%{tde_docdir}/HTML
 for lang in *; do
   if [ -d $lang ]; then
     pushd $lang
@@ -483,9 +484,9 @@ update-desktop-database -q &> /dev/null ||:
 %{_datadir}/apps/koshell/
 %{_datadir}/apps/thesaurus/
 %{_datadir}/config.kcfg/koshell.kcfg
-%{_datadir}/doc/HTML/en/koffice/
-%{_datadir}/doc/HTML/en/koshell/
-%{_datadir}/doc/HTML/en/thesaurus/
+%{tde_docdir}/HTML/en/koffice/
+%{tde_docdir}/HTML/en/koshell/
+%{tde_docdir}/HTML/en/thesaurus/
 %{_datadir}/icons/crystalsvg/*/*/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
@@ -538,7 +539,7 @@ update-desktop-database -q &> /dev/null ||:
 
 %files devel
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/koffice-apidocs/
+%lang(en) %{tde_docdir}/HTML/en/koffice-apidocs/
 %{_includedir}/*
 # FIXME: include only shlib symlinks we know/want to export
 %{_libdir}/lib*.so
@@ -547,7 +548,7 @@ update-desktop-database -q &> /dev/null ||:
 
 %files kword
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kword/
+%lang(en) %{tde_docdir}/HTML/en/kword/
 %{_bindir}/kword
 %{_libdir}/libkdeinit_kword.so
 %{_libdir}/libkwordprivate.so.*
@@ -562,7 +563,7 @@ update-desktop-database -q &> /dev/null ||:
 
 %files kspread
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kspread/
+%lang(en) %{tde_docdir}/HTML/en/kspread/
 %{_bindir}/kspread
 %{_libdir}/libkdeinit_kspread.so
 %{tde_libdir}/kspread.*
@@ -589,7 +590,7 @@ update-desktop-database -q &> /dev/null ||:
 
 %files kpresenter
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kpresenter/
+%lang(en) %{tde_docdir}/HTML/en/kpresenter/
 %{_bindir}/kpresenter
 %{_bindir}/kprconverter.pl
 %{_libdir}/libkdeinit_kpresenter.so
@@ -604,7 +605,7 @@ update-desktop-database -q &> /dev/null ||:
 
 %files karbon
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/karbon/
+%lang(en) %{tde_docdir}/HTML/en/karbon/
 %{_bindir}/karbon
 %{_libdir}/libkdeinit_karbon.so
 %{tde_libdir}/*karbon*.*
@@ -619,7 +620,7 @@ update-desktop-database -q &> /dev/null ||:
 
 %files kugar
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kugar/
+%lang(en) %{tde_docdir}/HTML/en/kugar/
 %{_bindir}/kugar
 %{_bindir}/kudesigner
 %{_libdir}/libkdeinit_kugar.so
@@ -638,7 +639,7 @@ update-desktop-database -q &> /dev/null ||:
 
 %files kexi
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kexi/
+%lang(en) %{tde_docdir}/HTML/en/kexi/
 %{_bindir}/kexi*
 %{_bindir}/ksqlite*
 %{_libdir}/libkdeinit_kexi.so
@@ -682,7 +683,7 @@ update-desktop-database -q &> /dev/null ||:
 
 %files kchart
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kchart/
+%lang(en) %{tde_docdir}/HTML/en/kchart/
 %{_bindir}/kchart
 %{_libdir}/libkchart*.so.*
 %{_libdir}/libkdeinit_kchart.so
@@ -693,7 +694,7 @@ update-desktop-database -q &> /dev/null ||:
 
 %files kformula
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kformula/
+%lang(en) %{tde_docdir}/HTML/en/kformula/
 %{_bindir}/kformula
 %{_libdir}/libkdeinit_kformula.so
 %{tde_libdir}/*kformula*.*
@@ -703,7 +704,7 @@ update-desktop-database -q &> /dev/null ||:
 
 %files kivio
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kivio/
+%lang(en) %{tde_docdir}/HTML/en/kivio/
 %{_bindir}/kivio
 %{_libdir}/libkdeinit_kivio.so
 %{_libdir}/libkiviocommon.so.*
@@ -770,7 +771,7 @@ update-desktop-database -q &> /dev/null ||:
 
 %files kplato
 %defattr(-,root,root,-)
-%lang(en) %{_docdir}/HTML/en/kplato/
+%lang(en) %{tde_docdir}/HTML/en/kplato/
 %{_bindir}/kplato
 %{_libdir}/libkdeinit_kplato.so
 %{tde_libdir}/kplato.*
@@ -950,8 +951,7 @@ update-desktop-database -q &> /dev/null ||:
 %{_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop
 %{_datadir}/apps/chalk
 %{_datadir}/apps/chalkplugins
-#%{tde_docdir}/HTML/en/chalk
-%lang(en) %{_docdir}/HTML/en/chalk
+%lang(en) %{tde_docdir}/HTML/en/chalk
 %{_datadir}/icons/hicolor/*/apps/chalk.png
 %{_datadir}/services/chalk*.desktop
 %{_datadir}/servicetypes/chalk*.desktop
@@ -959,6 +959,9 @@ update-desktop-database -q &> /dev/null ||:
 
 
 %changelog
+* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-2
+- Fix HTML directory location
+
 * Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
 - Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn'
diff --git a/redhat/applications/ktechlab/trinity-ktechlab.spec b/redhat/applications/ktechlab/trinity-ktechlab.spec
index b93b6d73a..5e5cf5673 100644
--- a/redhat/applications/ktechlab/trinity-ktechlab.spec
+++ b/redhat/applications/ktechlab/trinity-ktechlab.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp ktechlab
 %define version 0.3
-%define release 1
+%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -55,8 +55,9 @@ Homepage: http://ktechlab.org/
 
 # 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"
@@ -102,7 +103,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/apps/katepart/syntax/microbe.xml
 %{_datadir}/apps/ktechlab
 %{_datadir}/config.kcfg/ktechlab.kcfg
-%{_docdir}/HTML/en/ktechlab/
+%{tde_docdir}/HTML/en/ktechlab/
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/mimelnk/application/x-circuit.desktop
 %{_datadir}/mimelnk/application/x-flowcode.desktop
@@ -111,5 +112,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-2
+- Fix HTML directory location
+
 * Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kvirc/kvirc-3.5.13-directories.patch b/redhat/applications/kvirc/kvirc-3.5.13-directories.patch
new file mode 100644
index 000000000..021671fee
--- /dev/null
+++ b/redhat/applications/kvirc/kvirc-3.5.13-directories.patch
@@ -0,0 +1,15 @@
+--- kvirc/admin/acinclude.m4.in.ORI	2011-11-25 19:57:17.296988361 +0100
++++ kvirc/admin/acinclude.m4.in	2011-11-25 19:57:47.365665354 +0100
+@@ -2603,10 +2603,10 @@
+ 	helpdir="\${globalkvircdir}/help/en"
+ 	AC_SUBST(helpdir)
+ 
+-	pluglibdir="\${globalkvircdir}/modules"
++	pluglibdir="\${libdir}/kvirc/$SS_DIRTAG/modules"
+ 	AC_SUBST(pluglibdir)
+ 
+-	modulelibdir="\${globalkvircdir}/modules"
++	modulelibdir="\${libdir}/kvirc/$SS_DIRTAG/modules"
+ 	AC_SUBST(modulelibdir)
+ 
+ 	defscriptdir="\${globalkvircdir}/defscript"
diff --git a/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch b/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch
new file mode 100644
index 000000000..4aca15ea1
--- /dev/null
+++ b/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch
@@ -0,0 +1,11 @@
+--- kvirc/src/kvirc/build/Makefile.am.ORI	2011-11-26 22:37:04.065565368 +0100
++++ kvirc/src/kvirc/build/Makefile.am	2011-11-26 22:37:17.139565032 +0100
+@@ -8,7 +8,7 @@
+ AM_CPPFLAGS = -I$(SS_TOPSRCDIR)/src/kvilib/include/ -I$(SS_TOPSRCDIR)/src/kvirc/include/ \
+ $(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\"
+ 
+-kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH)
++kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -lDCOP -lkdefx -lkio
+ kvirc_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la
+ 
+ bin_PROGRAMS = kvirc
diff --git a/redhat/applications/kvirc/trinity-kvirc.spec b/redhat/applications/kvirc/trinity-kvirc.spec
new file mode 100644
index 000000000..1d4de4b88
--- /dev/null
+++ b/redhat/applications/kvirc/trinity-kvirc.spec
@@ -0,0 +1,185 @@
+# Default version for this component
+%define kdecomp kvirc
+%define version 3.4.0
+%define release 1
+
+# 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
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Trinity based next generation IRC client with module support
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://kvirc.net/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+Patch0:		kvirc-3.5.13-directories.patch
+Patch1:		kvirc-3.5.13-ftbfs.patch
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+Requires:	%{name}-data = %{version}-%{release}
+
+%description
+A highly configurable graphical IRC client with an MDI interface,
+built-in scripting language, support for IRC DCC, drag & drop file
+browsing, and much more. KVIrc uses the KDE widget set, can be extended
+using its own scripting language, integrates with KDE, and supports
+custom plugins.
+
+If you are a developer and you want to write a custom module for KVIrc,
+you need to install the kvirc-dev package.
+
+%package data
+Group:		Applications/Utilities
+Summary:	Data files for KVIrc
+Requires:	%{name} = %{version}-%{release}
+
+%description data
+This package contains the architecture-independent data needed by KVIrc in
+order to run, such as icons and images, language files, and shell scripts.
+It also contains complete reference guides on scripting and functions
+within KVIrc in its internal help format. Unless you want to use KVIrc only
+as a very simple IRC client you are likely to want to write scripts to
+tailor KVIrc to your needs.
+
+KVIrc is a graphical IRC client based on the KDE widget set which integrates
+with the K Desktop Environment version 3.
+
+%package devel
+Group:		Development/Libraries
+Summary:	Development files for KVIrc
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+This package contains KVIrc libraries and include files you need if you
+want to develop plugins for KVIrc.
+
+KVIrc is a graphical IRC client based on the KDE widget set which integrates
+with the K Desktop Environment version 3.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+%patch1 -p1
+
+# 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" \
+  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+
+# Hardcoded absolute PATH to KDEDIR in source code ! That sucks !
+%__sed -i src/kvirc/kernel/kvi_app_fs.cpp \
+  -e "s,/opt/kde3/lib,%{_prefix}/%{_lib},g"
+%__sed -i src/kvirc/kernel/kvi_app_setup.cpp \
+  -e "s,/opt/kde3,%{_prefix},g"
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+./autogen.sh
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export KDEDIR=%{_prefix}
+
+%configure \
+	--disable-rpath \
+	--with-fno-rtti --with-aa-fonts --with-big-channels \
+	--enable-perl --with-pic --enable-wall \
+	--with-ix86-asm \
+	--with-qt-moc=%{_bindir}/tmoc \
+    --with-extra-includes=%{_includedir}/tqt \
+    --with-kde-services-dir=%{_datadir}/services \
+	--with-kde-library-dir=%{_libdir} \
+	--with-kde-include-dir=%{_includedir}
+
+# Symbolic links must exist prior to parallel building
+%__make symlinks -C src/kvilib/build
+%__make symlinks -C src/kvirc/build
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ...
+%__mv \
+  %{?buildroot}%{_datadir}/kvirc/3.4/license/COPYING \
+  %{?buildroot}%{_datadir}/kvirc/3.4/license/EULA
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog FAQ README TODO
+%{_bindir}/kvirc
+%{_libdir}/*.so.*
+%{_libdir}/kvirc/*/modules/*.so
+
+%files data
+%defattr(-,root,root,-)
+%{_bindir}/kvi_run_netscape
+%{_bindir}/kvi_search_help
+%{_libdir}/kvirc/*/modules/caps/
+%{_datadir}/applnk/Internet/kvirc.desktop
+%{_datadir}/icons/hicolor/
+%{_datadir}/kvirc
+%{_datadir}/mimelnk/text/*.desktop
+%{_datadir}/services/*.protocol
+%{_mandir}/man1/kvirc.1.gz
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/kvirc-config
+%{_includedir}/kvirc/
+%{_libdir}/*.la
+%{_libdir}/*.so
+%{_libdir}/kvirc/*/modules/*.la
+
+
+%Changelog
+* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.4.0-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/piklab/trinity-piklab.spec b/redhat/applications/piklab/trinity-piklab.spec
index 3ee2a54eb..a2c698665 100644
--- a/redhat/applications/piklab/trinity-piklab.spec
+++ b/redhat/applications/piklab/trinity-piklab.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp piklab
 %define version 0.15.2
-%define release 1
+%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -56,8 +56,9 @@ are supported. A command-line programmer and debugger are also available.
 
 # 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"
@@ -110,7 +111,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/apps/katepart/syntax/coff-pic.xml
 %{_datadir}/apps/katepart/syntax/jal-pic.xml
 %{_datadir}/apps/piklab
-%{_docdir}/HTML/en/piklab
+%{tde_docdir}/HTML/en/piklab
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/mimelnk/application/x-piklab.desktop
 %{_mandir}/man1/piklab-coff.1.gz
@@ -120,5 +121,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-2
+- Fix HTML directory location
+
 * Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tellico/trinity-tellico.spec b/redhat/applications/tellico/trinity-tellico.spec
index 706eb4c30..b08853722 100644
--- a/redhat/applications/tellico/trinity-tellico.spec
+++ b/redhat/applications/tellico/trinity-tellico.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp tellico
 %define version 1.3.2.1
-%define release 1
+%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -107,8 +107,9 @@ as a separate package which can be updated through debian-volatile.
 
 # 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"
@@ -136,7 +137,7 @@ export PATH="%{_bindir}:${PATH}"
 %__install -D -c -p -m 644 -T icons/tellico_mime.svg %{?buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
 
 # Remove  dead symlink from French translation
-%__rm %{?buildroot}%{_docdir}/HTML/fr/tellico/common
+%__rm %{?buildroot}%{tde_docdir}/HTML/fr/tellico/common
 
 %__install -D -c -p -m 644 -T %{SOURCE1} %{?buildroot}%{_datadir}/pixmaps/tellico.xpm
 
@@ -179,7 +180,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/apps/tellico/tellicoui.rc
 %{_datadir}/apps/tellico/welcome.html
 %{_datadir}/config.kcfg
-%{_docdir}/HTML/*/tellico/
+%{tde_docdir}/HTML/*/tellico/
 %{_datadir}/icons
 %{_datadir}/apps/mime
 %{_datadir}/mimelnk
@@ -194,5 +195,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-2
+- Fix HTML directory location
+
 * Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/components.txt b/redhat/components.txt
index 49a0cd0dd..576d1cad2 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -38,6 +38,7 @@ applications/krename
 applications/yakuake
 #applications/desktop-effects-kde
 applications/filelight
+applications/filelight-l10n
 applications/kdiff3
 #applications/kuickshow
 #applications/basket
@@ -80,3 +81,4 @@ applications/kile
 applications/kdmtheme
 applications/knemo
 applications/kerry
+applications/kvirc