RPM: various updates for TDE 14.0.11

Signed-off-by: François Andriot <albator78@libertysurf.fr>

20 files changed, 106 insertions, 80 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index dfd5bf589..c71c7709b 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -24,10 +24,10 @@ buildpkg = \
 
 
 all:	dependencies main libraries applications i18n meta
-dependencies:	tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls tqscintilla avahi-tqt dbus-tqt dbus-1-tqt
+dependencies:	tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqscintilla avahi-tqt dbus-tqt dbus-1-tqt
 main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
 libraries:	kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
-applications:	abakus amarok basket bibletime codeine 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 klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
+applications:	abakus amarok basket bibletime codeine 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 klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-suse2 wlassistant yakuake
 i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 
 
@@ -65,10 +65,7 @@ sip4-tqt:
 tqca:	tqtinterface
 	$(call buildpkg,dependencies/tqca)
 
-tqca-tls: tqtinterface tqca
-	$(call buildpkg,dependencies/tqca-tls)
-
-tqscintilla: tqca-tls tdelibs
+tqscintilla: tqca tdelibs
 	$(call buildpkg,dependencies/tqscintilla)
 
 tqt3:
@@ -536,6 +533,9 @@ tdeio-apt:	tdebase
 tdeio-ftps:	tdebase
 	$(call buildpkg,applications/tdeio-ftps)
 
+tdeio-gopher:	tdebase
+	$(call buildpkg,applications/tdeio-gopher)
+
 tdeio-locate:	tdebase
 	$(call buildpkg,applications/tdeio-locate)
 
diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec
index 156376625..52085c0c0 100644
--- a/redhat/applications/amarok/amarok.spec
+++ b/redhat/applications/amarok/amarok.spec
@@ -396,7 +396,7 @@ Requires:		trinity-konqueror
 %defattr(-,root,root,-)
 %{tde_datadir}/apps/konqueror/servicemenus/*.desktop
 %{tde_tdelibdir}/konqsidebar_universalamarok.*
-%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop
+%{tde_datadir}/apps/konqsidebartng/*/amarok_konquisidebar.desktop
 
 
 ##########
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
index 0c82b8b5f..373c65ab3 120000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
+++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
@@ -1 +1 @@
-../../../ubuntu/xenial/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file
+../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
index f71a6795b..62aa57f04 120000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
+++ b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
@@ -1 +1 @@
-../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file
+../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
index 8e006a46b..2d0ca2867 120000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
+++ b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
@@ -1 +1 @@
-../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file
+../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file
diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/kbookreader/kbookreader.spec
index 38167cbd5..0d9692b4f 100644
--- a/redhat/applications/kbookreader/kbookreader.spec
+++ b/redhat/applications/kbookreader/kbookreader.spec
@@ -144,7 +144,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
-%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" Office Viewer
+%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbookreader.desktop" Office Viewer
 %endif
 
 %find_lang %{tde_pkg} || touch %{tde_pkg}.lang
@@ -157,13 +157,13 @@ export PATH="%{tde_bindir}:${PATH}"
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{tde_bindir}/bookreader
-%{tde_bindir}/bookreader_client
-%{tde_tdeappdir}/bookreader.desktop
-%{tde_datadir}/apps/bookreader/
-%{tde_datadir}/config.kcfg/bookreader.kcfg
-%{tde_tdedocdir}/HTML/en/bookreader/
-%{tde_datadir}/icons/hicolor/*/apps/bookreader.png
+%{tde_bindir}/kbookreader
+%{tde_bindir}/kbookreader_client
+%{tde_tdeappdir}/kbookreader.desktop
+%{tde_datadir}/apps/kbookreader/
+%{tde_datadir}/config.kcfg/kbookreader.kcfg
+%{tde_tdedocdir}/HTML/en/kbookreader/
+%{tde_datadir}/icons/hicolor/*/apps/kbookreader.png
 
 
 %changelog
diff --git a/redhat/applications/kdbg/kdbg.spec b/redhat/applications/kdbg/kdbg.spec
index b37eef30f..5a4a17a69 100644
--- a/redhat/applications/kdbg/kdbg.spec
+++ b/redhat/applications/kdbg/kdbg.spec
@@ -63,7 +63,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake libtool m4
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -113,33 +113,37 @@ Features include the following:
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__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}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
 
 %__make %{?_smp_mflags} || %__make
 
@@ -147,7 +151,7 @@ export kde_confdir="%{tde_confdir}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
@@ -167,6 +171,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/
 %{tde_datadir}/icons/hicolor/*/apps/kdbg.png
 %{tde_datadir}/icons/locolor/*/apps/kdbg.png
+%{tde_mandir}/man1/kdbg.*
 
 
 %changelog
diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/kvpnc/kvpnc.spec
index 08d0f4994..ca2bd8d39 100644
--- a/redhat/applications/kvpnc/kvpnc.spec
+++ b/redhat/applications/kvpnc/kvpnc.spec
@@ -169,6 +169,7 @@ export PATH="%{_bindir}:${PATH}"
 %lang(sv) %{tde_datadir}/doc/tde/HTML/sv/kvpnc/
 %{tde_datadir}/icons/hicolor/*/apps/kvpnc.png
 %{tde_datadir}/icons/locolor/*/apps/kvpnc.png
+%{tde_docdir}/kvpnc/
 %{tde_tdedocdir}/HTML/en/tdeioslave/pcf/
 %{tde_datadir}/services/pcf.protocol
 %{tde_mandir}/man1/*.1*
diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/mathemagics/mathemagics.spec
index 975471623..21ca470e2 100644
--- a/redhat/applications/mathemagics/mathemagics.spec
+++ b/redhat/applications/mathemagics/mathemagics.spec
@@ -107,12 +107,14 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
+%find_lang %{tde_pkg}
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{tde_bindir}/mathemagics
diff --git a/redhat/applications/tde-guidance/tde-guidance.spec b/redhat/applications/tde-guidance/tde-guidance.spec
index 74fdb60fd..202b88003 100644
--- a/redhat/applications/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/tde-guidance/tde-guidance.spec
@@ -194,7 +194,6 @@ or can be run as standalone applications.
 %{tde_datadir}/apps/guidance/
 %{tde_tdeappdir}/*.desktop
 %{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/icons/crystalsvg/*/*/*.svg
 %{python_sitearch}/%{name}/SMBShareSelectDialog.py*
 %{python_sitearch}/%{name}/SimpleCommandRunner.py*
 %{python_sitearch}/%{name}/fuser.py*
diff --git a/redhat/applications/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio-apt/tdeio-apt.spec
index 9c0cfe6d6..9899044ee 100644
--- a/redhat/applications/tdeio-apt/tdeio-apt.spec
+++ b/redhat/applications/tdeio-apt/tdeio-apt.spec
@@ -141,14 +141,14 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang tdeio_apt
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files -f tdeio_apt.lang
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG ChangeLog COPYING
 %{tde_tdelibdir}/tdeio_apt.la
diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio-ftps/tdeio-ftps.spec
index b89d22983..640bc8809 100644
--- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec
+++ b/redhat/applications/tdeio-ftps/tdeio-ftps.spec
@@ -144,14 +144,14 @@ fi
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang tdeio_ftps
 
 
 %clean
 %__rm -rf %{?buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files -f tdeio_ftps.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc README Changelog COPYING AUTHORS
diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio-gopher/tdeio-gopher.spec
index d4c862df3..87fe4c307 100644
--- a/redhat/applications/tdeio-gopher/tdeio-gopher.spec
+++ b/redhat/applications/tdeio-gopher/tdeio-gopher.spec
@@ -72,9 +72,6 @@ BuildRequires:	libacl-devel
 # IDN support
 BuildRequires:	libidn-devel
 
-# OPENSSL support
-BuildRequires:	openssl-devel
-
 # SUSE desktop files utility
 %if 0%{?suse_version}
 BuildRequires:	update-desktop-files
@@ -85,9 +82,6 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-Obsoletes:		trinity-kio-gopher < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kio-gopher = %{?epoch:%{epoch}:}%{version}-%{release}
-
 
 %description
 Adds support for the "gopher:" protocol
@@ -146,40 +140,41 @@ fi
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang tdeio_gopher
 
 
 %clean
 %__rm -rf %{?buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files -f tdeio_gopher.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING FAQ README VERSION
 %{tde_tdelibdir}/tdeio_gopher.la
 %{tde_tdelibdir}/tdeio_gopher.so
 %{tde_datadir}/services/gopher.protocol
-%lang(ca) %{tde_tdedocdir}/HTML/ca/tdeio-gopher/
-%lang(da) %{tde_tdedocdir}/HTML/da/tdeio-gopher/
-%lang(de) %{tde_tdedocdir}/HTML/de/tdeio-gopher/
-%lang(en) %{tde_tdedocdir}/HTML/en/tdeioslave/gopher/
-%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/tdeio-gopher/
-%lang(es) %{tde_tdedocdir}/HTML/es/tdeio-gopher/
-%lang(et) %{tde_tdedocdir}/HTML/et/tdeio-gopher/
-%lang(fr) %{tde_tdedocdir}/HTML/fr/tdeio-gopher/
-%lang(gl) %{tde_tdedocdir}/HTML/gl/tdeio-gopher/
-%lang(hu) %{tde_tdedocdir}/HTML/hu/tdeio-gopher/
-%lang(it) %{tde_tdedocdir}/HTML/it/tdeio-gopher/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/tdeio-gopher/
-%lang(pl) %{tde_tdedocdir}/HTML/pl/tdeio-gopher/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/tdeio-gopher/
-%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/tdeio-gopher/
-%lang(ro) %{tde_tdedocdir}/HTML/ro/tdeio-gopher/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/tdeio-gopher/
-%lang(sr) %{tde_tdedocdir}/HTML/sr/tdeio-gopher/
-%lang(sr@Latn) %{tde_tdedocdir}/HTML/sr@Latn/tdeio-gopher/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/tdeio-gopher/
-%lang(uk) %{tde_tdedocdir}/HTML/uk/tdeio-gopher/
+%lang(ca) %{tde_tdedocdir}/HTML/ca/tdeioslave/
+%lang(da) %{tde_tdedocdir}/HTML/da/tdeioslave/
+%lang(de) %{tde_tdedocdir}/HTML/de/tdeioslave/
+%lang(en) %{tde_tdedocdir}/HTML/en/tdeioslave/
+%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/tdeioslave/
+%lang(es) %{tde_tdedocdir}/HTML/es/tdeioslave/
+%lang(et) %{tde_tdedocdir}/HTML/et/tdeioslave/
+%lang(fr) %{tde_tdedocdir}/HTML/fr/tdeioslave/
+%lang(gl) %{tde_tdedocdir}/HTML/gl/tdeioslave/
+%lang(hu) %{tde_tdedocdir}/HTML/hu/tdeioslave/
+%lang(it) %{tde_tdedocdir}/HTML/it/tdeioslave/
+%lang(nl) %{tde_tdedocdir}/HTML/nl/tdeioslave/
+%lang(pl) %{tde_tdedocdir}/HTML/pl/tdeioslave/
+%lang(pt) %{tde_tdedocdir}/HTML/pt/tdeioslave/
+%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/tdeioslave/
+%lang(ro) %{tde_tdedocdir}/HTML/ro/tdeioslave/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/tdeioslave/
+%lang(sk) %{tde_tdedocdir}/HTML/sk/tdeioslave/
+%lang(sr) %{tde_tdedocdir}/HTML/sr/tdeioslave/
+%lang(sr@Latn) %{tde_tdedocdir}/HTML/sr@Latn/tdeioslave/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/tdeioslave/
+%lang(uk) %{tde_tdedocdir}/HTML/uk/tdeioslave/
 
 
 %changelog
diff --git a/redhat/applications/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio-sword/tdeio-sword.spec
index ec8f06a18..2846be7dd 100644
--- a/redhat/applications/tdeio-sword/tdeio-sword.spec
+++ b/redhat/applications/tdeio-sword/tdeio-sword.spec
@@ -154,20 +154,20 @@ fi
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
+%find_lang tdeio_sword
 
 
 %clean
 %__rm -rf %{?buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files -f tdeio_sword.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{tde_tdelibdir}/tdeio_sword.la
 %{tde_tdelibdir}/tdeio_sword.so
 %{tde_datadir}/apps/tdeio_sword/
-%{tde_tdedocdir}/HTML/en/tdeio_sword/
+%{tde_tdedocdir}/HTML/en/tdeioslave/sword/
 %{tde_datadir}/icons/hicolor/*/apps/tdeio_sword.png
 %{tde_datadir}/icons/hicolor/scalable/apps/tdeio_sword.svgz
 %{tde_datadir}/services/sword.protocol
diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec
index cc6a5bb13..e230248f9 100644
--- a/redhat/dependencies/tqca/tqca.spec
+++ b/redhat/dependencies/tqca/tqca.spec
@@ -31,6 +31,12 @@
 %define libtqca libtqca
 %endif
 
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libtqt3 %{_lib}tqt3
+%else
+%define libtqt3 libtqt3
+%endif
+
 
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
@@ -55,9 +61,13 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		trinity-tqca-rpmlintrc
 
+Obsoletes:		%{libtqt3}-mt-tqca-tls < %{version}-%{release}
+Provides:		%{libtqt3}-mt-tqca-tls = %{version}-%{release}
+
 BuildRequires:  libtqt4-devel >= %{tde_epoch}:4.2.0
 BuildRequires:	cmake
 BuildRequires:	gcc-c++
+BuildRequires:	openssl-devel >= 0.9.8
 
 %description
 Taking a hint from the similarly-named Java Cryptography Architecture,
@@ -129,6 +139,8 @@ This packages contains the development files for TQCA
 %{_libdir}/libtqca.la
 %{_libdir}/libtqca.so
 %{_libdir}/pkgconfig/tqca.pc
+%dir %{_libdir}/tqt3/plugins/crypto
+%{_libdir}/tqt3/plugins/crypto/libtqca-tls.so
 
 ##########
 
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 7cf29ecb0..5c0834426 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -209,6 +209,7 @@ Requires: trinity-tde-systemsettings
 Requires: trinity-tdedocker
 Requires: trinity-tdeio-apt
 Requires: trinity-tdeio-ftps
+Requires: trinity-tdeio-gopher
 Requires: trinity-tdeio-locate
 Requires: trinity-tdeio-sword
 Requires: trinity-tdeio-umountwrapper
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 1242b9af9..0106b710e 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -253,6 +253,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/et/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/fi/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/fr/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/gl/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/he/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/hu/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/it/common
@@ -266,6 +267,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sk/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sl/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sr/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sr@Latn/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sv/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/tr/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/uk/common
@@ -531,6 +533,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/br/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/bs/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ca/LC_MESSAGES/
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ca@valencia/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/cs/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/csb/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/cy/LC_MESSAGES/
@@ -606,6 +609,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/tg/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/th/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/tr/LC_MESSAGES/
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ug/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uk/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uk@cyrillic/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uz/LC_MESSAGES/
diff --git a/redhat/main/tde-i18n/tde-i18n.spec b/redhat/main/tde-i18n/tde-i18n.spec
index 29bb1ecfd..97eda4a8b 100644
--- a/redhat/main/tde-i18n/tde-i18n.spec
+++ b/redhat/main/tde-i18n/tde-i18n.spec
@@ -1427,6 +1427,11 @@ for l in %{TDE_LANGS}; do
   for f in tde-i18n-${l}/; do
     if [ -d "${f}" ]; then 
       pushd ${f}
+
+      if [ ! -d cmake ]; then
+        ln -s ../cmake cmake
+      fi
+
       if ! rpm -E %%cmake|grep -q "cd build"; then
         %__mkdir_p build
         cd build
diff --git a/redhat/main/tdeartwork/tdeartwork.spec b/redhat/main/tdeartwork/tdeartwork.spec
index b0dab58db..5c2ec0ea5 100644
--- a/redhat/main/tdeartwork/tdeartwork.spec
+++ b/redhat/main/tdeartwork/tdeartwork.spec
@@ -362,6 +362,7 @@ This package is part of Trinity, and a component of the TDE artwork module.
 %{tde_bindir}/kblob.kss
 %{tde_bindir}/klines.kss
 %{tde_bindir}/kwave.kss
+%{tde_bindir}/tdeasciiquarium.kss
 %{tde_datadir}/applnk/System/ScreenSavers/KBanner.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/KBlob.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/KClock.desktop
diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec
index 178a98821..86e66f620 100644
--- a/redhat/main/tdenetwork/tdenetwork.spec
+++ b/redhat/main/tdenetwork/tdenetwork.spec
@@ -75,6 +75,7 @@ Source3:	trinity-tdenetwork-rpmlintrc
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	libtqca-devel >= %{tde_epoch}:1.0
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gettext