9 files changed, 11 insertions, 432 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index c0f531506..491bdecee 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -27,7 +27,7 @@ main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim td
 libraries:	kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
 applications:	abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kooldock kopete-otr kpicosim kpilot kplayer krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc kxmleditor mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tastymenu tdedocker tde-guidance tdeio-apt tdeio-ftps tdeio-gopher tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
 i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-extras:	icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klamav klibido knoda kompose koverartist kpacman mathemagics png2qrgb
+extras:	icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kompose koverartist kpacman mathemagics png2qrgb
 
 
 ### Trinity Dependencies
@@ -801,12 +801,6 @@ ifeq ($(wildcard /boot/vmlinuz*.mga6*),)
 	$(call buildpkg,extras/fileshareset)
 endif
 
-hk_classes:
-# Not on Fedora 27, Opensuse TW
-ifeq (,$(filter $(DIST),.fc27 .fc28 .fc29 .oss150 .osstw))
-	$(call buildpkg,extras/hk_classes)
-endif
-
 icons-crystalsvg-updated:
 	$(call buildpkg,extras/icons-crystalsvg-updated)
 
@@ -825,24 +819,12 @@ kdevmon:
 kdissert:
 	$(call buildpkg,extras/kdissert)
 
-klamav:
-# Not on RHEL7, Fedora >= 27, Opensuse TW
-ifeq (,$(filter $(DIST),.el7 .fc27 .fc28 .fc29 .oss150 .osstw))
-	$(call buildpkg,extras/klamav)
-endif
-
 klibido: pan
 # Not on RHEL5, nor recent OpenSUSE
 ifeq (,$(filter $(DIST),.el5 .oss150 .osstw))
 	$(call buildpkg,extras/klibido)
 endif
 
-knoda: hk_classes
-# Not on Fedora 27, Opensuse TW
-ifeq (,$(filter $(DIST),.fc27 .fc28 .fc29 .oss150 .osstw))
-	$(call buildpkg,extras/knoda)
-endif
-
 kompose:
 	$(call buildpkg,extras/kompose)
 
diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/tde-style-baghira/tde-style-baghira.spec
index 652bb3993..185110631 100644
--- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec
+++ b/redhat/applications/tde-style-baghira/tde-style-baghira.spec
@@ -34,6 +34,8 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
+# Required for Mageia and PCLinuxOS: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
 
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
diff --git a/redhat/applications/tde-style-domino/tde-style-domino.spec b/redhat/applications/tde-style-domino/tde-style-domino.spec
index bb6f54b26..a2dfdd079 100644
--- a/redhat/applications/tde-style-domino/tde-style-domino.spec
+++ b/redhat/applications/tde-style-domino/tde-style-domino.spec
@@ -34,6 +34,8 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
+# Required for Mageia and PCLinuxOS: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
 
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
diff --git a/redhat/docker/oss150/packages b/redhat/docker/oss150/packages
index a9f29f93f..259133a11 100644
--- a/redhat/docker/oss150/packages
+++ b/redhat/docker/oss150/packages
@@ -108,6 +108,7 @@ libpng16-devel
 libpoppler-devel
 libpqxx-devel
 libpulse-devel
+libpx-devel
 libqalculate-devel
 libraw1394-devel
 librsvg-devel
@@ -183,6 +184,7 @@ valgrind
 vim
 wireless-tools
 wv2-devel
+xbase-devel
 xcb-proto-devel
 xscreensaver
 xscreensaver-data
diff --git a/redhat/docker/oss423/packages b/redhat/docker/oss423/packages
index e1ae8dff2..e76a81eb3 100644
--- a/redhat/docker/oss423/packages
+++ b/redhat/docker/oss423/packages
@@ -103,6 +103,7 @@ libneon-devel
 libnjb-devel
 libofx-devel
 libotr-devel
+libpaper-devel
 libpisock-devel
 libpng16-devel
 libpoppler-devel
@@ -130,6 +131,7 @@ libwmf-devel
 libwpd-devel
 libxine-devel
 libxslt-devel
+libyaz-devel
 libzrtpcpp-devel
 lilo
 lirc-devel
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index 7079d8d65..e95b8fa45 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -42,6 +42,7 @@ hspell-devel
 htdig
 ImageMagick-devel
 imake
+imlib2-devel
 java-devel
 lcms-devel
 lib64cryptsetup-devel
@@ -145,6 +146,7 @@ pilot-link-devel
 postgresql
 postgresql-devel
 pth-devel
+python3
 python-devel
 python-rpm
 recode
diff --git a/redhat/extras/klamav/klamav-14.0.0.spec b/redhat/extras/klamav/klamav-14.0.0.spec
deleted file mode 100644
index e60e67731..000000000
--- a/redhat/extras/klamav/klamav-14.0.0.spec
+++ /dev/null
@@ -1,173 +0,0 @@
-#
-# spec file for package klamav (version R14)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# Default version for this component
-%define tde_pkg klamav
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
-%endif
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:        Frontend for clamav
-Version:		0.46
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-#URL:			http://www.trinitydesktop.org/
-Url:            http://klamav.sourceforge.net/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{tde_pkg}-%{tde_version}.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 2:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-BuildRequires:	curl-devel
-BuildRequires:	gmp-devel
-BuildRequires:	sqlite-devel
-#BuildRequires:	unsermake
-BuildRequires:  fdupes
-
-BuildRequires:  clamav
-Requires:		clamav
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} == 1330
-BuildRequires:  clamav-devel
-%endif
-
-
-%description
-A TDE front-end for the Clam AntiVirus antivirus toolkit.
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{tde_pkg}-%{version}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  --without-included-sqlite \
-  --with-extra-includes=%{_includedir}/tqt
-
-find . -name "*.cpp" | while read f; do
-  mf="${f%.cpp}.moc"
-  if grep -qw "${mf##*/}" "${f}" && [ ! -f "${mf}" ]; then
-    tqmoc "${f%.cpp}.h" -o "${mf}"
-  fi
-done
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-	
-
-%post
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%postun
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/ScanWithKlamAV
-%{tde_bindir}/klamarkollon
-%{tde_bindir}/klamav
-%{tde_bindir}/klammail
-%{tde_tdeappdir}/klamav.desktop
-%{tde_datadir}/apps/klamav/
-%{tde_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop
-%{tde_datadir}/config.kcfg/klamavconfig.kcfg
-%{tde_tdedocdir}/HTML/en/klamav02/
-%{tde_datadir}/icons/hicolor/32x32/apps/klamav.png
-%{tde_datadir}/icons/hicolor/48x48/apps/klamav.png
-
-
-%changelog
diff --git a/redhat/extras/knoda/trinity-knoda.spec b/redhat/extras/knoda/trinity-knoda.spec
deleted file mode 100644
index 7b5ddfc28..000000000
--- a/redhat/extras/knoda/trinity-knoda.spec
+++ /dev/null
@@ -1,238 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-
-# TDE 3.5.13 specific building variables
-%define tde_version 14.0.1
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_confdir %{_sysconfdir}/trinity
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-Name:           trinity-knoda
-Version:        0.8.3
-Release:        1%{?dist}
-Summary:        A database frontend for TDE.
-
-Group:          Applications/Productivity
-License:        GPLv2+
-URL:            http://sourceforge.net/projects/knoda/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:        http://downloads.sourceforge.net/project/knoda/knoda/0.8.3/knoda-%{tde_version}.tar.gz
-
-BuildRequires:	desktop-file-utils
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	hk_classes-devel
-Requires:		hk_classes
-
-
-%description
-
-
-%package devel
-Summary:  	Development files for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{version}-%{release}
-
-
-%description devel
-%{summary}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n knoda-%{version}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export kde_confdir="%{tde_confdir}"
-
-
-%configure \
-	--prefix=%{tde_prefix} \
-	--exec-prefix=%{tde_prefix} \
-	--disable-dependency-tracking \
-	--enable-rpath \
-	--bindir=%{tde_bindir} \
-	--libdir=%{tde_libdir} \
-	--datadir=%{tde_datadir} \
-	--includedir=%{tde_tdeincludedir} 
-
- 
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-
-# Useless files ..
-%__rm -f %{?buildroot}%{tde_libdir}/*.a
-%__rm -f %{?buildroot}%{tde_tdelibdir}/*.a
-
-%find_lang knoda
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-for i in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-
-
-%postun
-for i in hicolor locolor ; do
- touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || :
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || :
-done
-
-
-%files -f knoda.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
-%{tde_bindir}/knoda
-%{tde_bindir}/knoda-rt
-%{tde_libdir}/libhk_kdeclasses.la
-%{tde_libdir}/libhk_kdeclasses.so
-%{tde_tdelibdir}/libhk_kdedbdesignerpart.la
-%{tde_tdelibdir}/libhk_kdedbdesignerpart.so
-%{tde_tdelibdir}/libhk_kdeformpart.la
-%{tde_tdelibdir}/libhk_kdeformpart.so
-%{tde_tdelibdir}/libhk_kdegridpart.la
-%{tde_tdelibdir}/libhk_kdegridpart.so
-%{tde_tdelibdir}/libhk_kdemodulepart.la
-%{tde_tdelibdir}/libhk_kdemodulepart.so
-%{tde_tdelibdir}/libhk_kdeqbepart.la
-%{tde_tdelibdir}/libhk_kdeqbepart.so
-%{tde_tdelibdir}/libhk_kdequerypart.la
-%{tde_tdelibdir}/libhk_kdequerypart.so
-%{tde_tdelibdir}/libhk_kdereportpart.la
-%{tde_tdelibdir}/libhk_kdereportpart.so
-%{tde_tdelibdir}/libhk_kdetablepart.la
-%{tde_tdelibdir}/libhk_kdetablepart.so
-%{tde_datadir}/applnk/Office/knoda.desktop
-%{tde_datadir}/apps/hk_kdeclasses/
-%{tde_datadir}/apps/knoda/
-%{tde_confdir}/magic/hk_classes.magic
-%{tde_tdedocdir}/HTML/en/knoda/
-%{tde_datadir}/icons/hicolor/*/apps/knoda.png
-%{tde_datadir}/icons/locolor/*/apps/knoda.png
-%{tde_datadir}/mimelnk/application/x-hk_classes-sqlite2.desktop
-%{tde_datadir}/mimelnk/application/x-hk_classes-sqlite3.desktop
-%{tde_datadir}/mimelnk/application/x-hk_connection.desktop
-%{tde_datadir}/mimelnk/application/x-paradox.desktop
-%{tde_datadir}/mimelnk/application/x-xbase.desktop
-%{tde_datadir}/services/hk_kdedbdesignerpart.desktop
-%{tde_datadir}/services/hk_kdeformpart.desktop
-%{tde_datadir}/services/hk_kdegridpart.desktop
-%{tde_datadir}/services/hk_kdemodulepart.desktop
-%{tde_datadir}/services/hk_kdeqbepart.desktop
-%{tde_datadir}/services/hk_kdequerypart.desktop
-%{tde_datadir}/services/hk_kdereportpart.desktop
-%{tde_datadir}/services/hk_kdetablepart.desktop
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/hk_kdeboolean.h
-%{tde_tdeincludedir}/hk_kdebutton.h
-%{tde_tdeincludedir}/hk_kdecolumn.h
-%{tde_tdeincludedir}/hk_kdecombobox.h
-%{tde_tdeincludedir}/hk_kdecsvexportdialog.h
-%{tde_tdeincludedir}/hk_kdecsvimportdialog.h
-%{tde_tdeincludedir}/hk_kdecsvimportdialogbase.h
-%{tde_tdeincludedir}/hk_kdedatasource.h
-%{tde_tdeincludedir}/hk_kdedate.h
-%{tde_tdeincludedir}/hk_kdedbdesignerpart.h
-%{tde_tdeincludedir}/hk_kdedbdesignerpartfactory.h
-%{tde_tdeincludedir}/hk_kdedblistview.h
-%{tde_tdeincludedir}/hk_kdedriverdialog.h
-%{tde_tdeincludedir}/hk_kdefilterdialog.h
-%{tde_tdeincludedir}/hk_kdefilterdialogbase.h
-%{tde_tdeincludedir}/hk_kdefinddialog.h
-%{tde_tdeincludedir}/hk_kdefinddialogbase.h
-%{tde_tdeincludedir}/hk_kdeform.h
-%{tde_tdeincludedir}/hk_kdeformdatasourcedialog.h
-%{tde_tdeincludedir}/hk_kdeformdatasourcedialogbase.h
-%{tde_tdeincludedir}/hk_kdeformfocus.h
-%{tde_tdeincludedir}/hk_kdeformpart.h
-%{tde_tdeincludedir}/hk_kdeformpartfactory.h
-%{tde_tdeincludedir}/hk_kdeformpartwidget.h
-%{tde_tdeincludedir}/hk_kdegrid.h
-%{tde_tdeincludedir}/hk_kdegridcolumndialog.h
-%{tde_tdeincludedir}/hk_kdegridcolumndialogbase.h
-%{tde_tdeincludedir}/hk_kdegridpart.h
-%{tde_tdeincludedir}/hk_kdegridpartfactory.h
-%{tde_tdeincludedir}/hk_kdeimage.h
-%{tde_tdeincludedir}/hk_kdeindexeditwindow.h
-%{tde_tdeincludedir}/hk_kdeinterpreterdialog.h
-%{tde_tdeincludedir}/hk_kdelabel.h
-%{tde_tdeincludedir}/hk_kdelineedit.h
-%{tde_tdeincludedir}/hk_kdememo.h
-%{tde_tdeincludedir}/hk_kdemessages.h
-%{tde_tdeincludedir}/hk_kdemodule.h
-%{tde_tdeincludedir}/hk_kdemodulepart.h
-%{tde_tdeincludedir}/hk_kdemodulepartfactory.h
-%{tde_tdeincludedir}/hk_kdenewpassworddialog.h
-%{tde_tdeincludedir}/hk_kdenewpassworddialogbase.h
-%{tde_tdeincludedir}/hk_kdepassworddialog.h
-%{tde_tdeincludedir}/hk_kdeproperty.h
-%{tde_tdeincludedir}/hk_kdepropertybase.h
-%{tde_tdeincludedir}/hk_kdeqbe.h
-%{tde_tdeincludedir}/hk_kdeqbepart.h
-%{tde_tdeincludedir}/hk_kdeqbepartfactory.h
-%{tde_tdeincludedir}/hk_kdequery.h
-%{tde_tdeincludedir}/hk_kdequerypart.h
-%{tde_tdeincludedir}/hk_kdequerypartfactory.h
-%{tde_tdeincludedir}/hk_kdequerypartwidget.h
-%{tde_tdeincludedir}/hk_kdereport.h
-%{tde_tdeincludedir}/hk_kdereportdata.h
-%{tde_tdeincludedir}/hk_kdereportpart.h
-%{tde_tdeincludedir}/hk_kdereportpartfactory.h
-%{tde_tdeincludedir}/hk_kdereportpartwidget.h
-%{tde_tdeincludedir}/hk_kdereportproperty.h
-%{tde_tdeincludedir}/hk_kdereportpropertybase.h
-%{tde_tdeincludedir}/hk_kdereportsection.h
-%{tde_tdeincludedir}/hk_kdereportsectiondialog.h
-%{tde_tdeincludedir}/hk_kdereportsectiondialogbase.h
-%{tde_tdeincludedir}/hk_kderowselector.h
-%{tde_tdeincludedir}/hk_kdesimpleform.h
-%{tde_tdeincludedir}/hk_kdesimplegrid.h
-%{tde_tdeincludedir}/hk_kdesimplereport.h
-%{tde_tdeincludedir}/hk_kdesubform.h
-%{tde_tdeincludedir}/hk_kdesubreportdialog.h
-%{tde_tdeincludedir}/hk_kdesubreportdialogbase.h
-%{tde_tdeincludedir}/hk_kdetable.h
-%{tde_tdeincludedir}/hk_kdetabledesign.h
-%{tde_tdeincludedir}/hk_kdetablepart.h
-%{tde_tdeincludedir}/hk_kdetablepartfactory.h
-%{tde_tdeincludedir}/hk_kdetablepartwidget.h
-%{tde_tdeincludedir}/hk_kdetoolbar.h
-%{tde_tdeincludedir}/hk_kdexmlexportdialog.h
-%{tde_tdeincludedir}/hk_kdexmlexportdialogbase.h
-
-
-%changelog
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
index 5a27ceb5e..430a7168a 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
@@ -297,8 +297,6 @@ Requires:	trinity-icons-oxygen
 #Requires:	trinity-kdebluetooth
 Requires:	trinity-kdevmon
 Requires:	trinity-kdissert
-Requires:	trinity-klamav
-Requires:	trinity-knoda
 Requires:	trinity-kompose
 Requires:	trinity-koverartist
 Requires:	trinity-kpacman