RPM: update build scripts for TDE R14.0.6

18 files changed, 458 insertions, 62 deletions

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 2cfd493e5..c0f531506 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -25,7 +25,7 @@ all:	dependencies main libraries applications i18n meta extras
 dependencies:	tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls 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 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 tde-guidance tdeio-apt tdeio-ftps 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
+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
 
@@ -688,6 +688,9 @@ soundkonverter:	tdebase
 tastymenu:	tdebase pytdeextensions
 	$(call buildpkg,applications/tastymenu)
 
+tdedocker:	tdebase
+	$(call buildpkg,applications/tdedocker)
+
 tde-guidance:	tdebase pytdeextensions
 	$(call buildpkg,applications/tde-guidance)
 
@@ -697,6 +700,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)
 
@@ -721,13 +727,13 @@ endif
 tderadio:	tdebase
 	$(call buildpkg,applications/tderadio)
 
-tde-style-baghira:
+tde-style-baghira: tdebase
 	$(call buildpkg,applications/tde-style-baghira)
 
-tde-style-domino:
+tde-style-domino: tdebase
 	$(call buildpkg,applications/tde-style-domino)
 
-tde-style-ia-ora:
+tde-style-ia-ora: tdebase
 	$(call buildpkg,applications/tde-style-ia-ora)
 
 tde-style-lipstik:	tdebase
@@ -820,8 +826,8 @@ kdissert:
 	$(call buildpkg,extras/kdissert)
 
 klamav:
-# Not on Fedora >= 27, Opensuse TW
-ifeq (,$(filter $(DIST),.fc27 .fc28 .fc29 .oss150 .osstw))
+# Not on RHEL7, Fedora >= 27, Opensuse TW
+ifeq (,$(filter $(DIST),.el7 .fc27 .fc28 .fc29 .oss150 .osstw))
 	$(call buildpkg,extras/klamav)
 endif
 
diff --git a/redhat/applications/kbibtex/kbibtex.spec b/redhat/applications/kbibtex/kbibtex.spec
index a9c900162..9148c5f29 100644
--- a/redhat/applications/kbibtex/kbibtex.spec
+++ b/redhat/applications/kbibtex/kbibtex.spec
@@ -80,7 +80,9 @@ BuildRequires:	openssl-devel
 BuildRequires:	libxslt-devel
 
 # YAZ support
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?suse_version}
 BuildRequires:	libyaz-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/kcmldap/kcmldap.spec
index cd637b617..5fcf25a9b 100644
--- a/redhat/applications/kcmldap/kcmldap.spec
+++ b/redhat/applications/kcmldap/kcmldap.spec
@@ -71,6 +71,15 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
+# ACL support
+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
@@ -170,19 +179,6 @@ This is a small daemon which keeps the LDAP root certificate up to date with the
 
 
 %build
-extra_includes="%{_includedir}"
-extra_libs="%{_libdir}"
-
-if [ -d "%{_includedir}/openldap24" ]; then
-  extra_includes="%{_includedir}/openldap24:${extra_includes}"
-  extra_libs="%{_libdir}/openldap24:${extra_libs}"
-fi
-
-if [ -d "%{_includedir}/heimdal" ]; then
-  extra_includes="%{_includedir}/heimdal:${extra_includes}"
-  extra_libs="%{_libdir}/heimdal:${extra_libs}"
-fi
-
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
@@ -211,6 +207,12 @@ fi
   -DBUILD_ALL=ON \
   -DBUILD_DOC=ON \
   -DBUILD_TRANSLATIONS=ON \
+  \
+%if 0%{?suse_version}
+  -DKRB5_FOUND=1 \
+  -DKRB5_LIBRARIES="-lkrb5" \
+  -DKRB5_INCLUDE_DIRS="/usr/include" \
+%endif
   ..
 
 %__make %{?_smp_mflags} || %__make
diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/keximdb/keximdb.spec
index c7c0c98a1..6627c48ec 100644
--- a/redhat/applications/keximdb/keximdb.spec
+++ b/redhat/applications/keximdb/keximdb.spec
@@ -133,7 +133,7 @@ fi
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 
 %clean
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index da0e97e3f..7ad17a36b 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
@@ -207,9 +207,8 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
-# Fix strange FTBFS on RHEL4
-%if 0%{?rhel} == 4
-grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po
+%if 0%{?fedora} >= 29
+LDFLAGS="-Wl,--allow-shlib-undefined"
 %endif
 
 # Warning: --enable-final causes FTBFS
diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/kooldock/kooldock.spec
index 5d0635d9f..647d511c7 100644
--- a/redhat/applications/kooldock/kooldock.spec
+++ b/redhat/applications/kooldock/kooldock.spec
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -103,32 +103,37 @@ Homepage: http://sourceforge.net/projects/kooldock/
 %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} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
+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} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -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}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
 
 %__make %{?_smp_mflags} || %__make
 
@@ -136,7 +141,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}
 
@@ -173,14 +178,10 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/apps/kooldock/backgrounds/osx/background-center.png
 %{tde_datadir}/apps/kooldock/backgrounds/osx/background-left.png
 %{tde_datadir}/apps/kooldock/backgrounds/osx/background-right.png
-%{tde_datadir}/apps/kooldock/icons/crystalsvg/128x128/apps/kooldock.png
-%{tde_datadir}/apps/kooldock/icons/crystalsvg/16x16/apps/kooldock.png
-%{tde_datadir}/apps/kooldock/icons/crystalsvg/32x32/apps/kooldock.png
-%{tde_datadir}/apps/kooldock/icons/crystalsvg/64x64/apps/kooldock.png
-%{tde_datadir}/icons/crystalsvg/128x128/apps/kooldock.png
 %{tde_datadir}/icons/crystalsvg/16x16/apps/kooldock.png
 %{tde_datadir}/icons/crystalsvg/32x32/apps/kooldock.png
 %{tde_datadir}/icons/crystalsvg/64x64/apps/kooldock.png
+%{tde_datadir}/icons/crystalsvg/128x128/apps/kooldock.png
 
 
 %changelog
diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc-14.0.0.spec
index fd781dae3..46d6a6d21 100644
--- a/redhat/applications/kvirc/kvirc-14.0.0.spec
+++ b/redhat/applications/kvirc/kvirc-14.0.0.spec
@@ -185,7 +185,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %__sed -i "src/modules/"*"/Makefile" -e "s|-Wl,--no-undefined||"
 %endif
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
index e24652adf..ddc7115cd 100644
--- a/redhat/applications/rosegarden/rosegarden-14.0.0.spec
+++ b/redhat/applications/rosegarden/rosegarden-14.0.0.spec
@@ -207,7 +207,7 @@ fi
   -DBUILD_ALL=ON \
   ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
diff --git a/redhat/applications/tastymenu/tastymenu.spec b/redhat/applications/tastymenu/tastymenu.spec
index f4feb52c1..984912246 100644
--- a/redhat/applications/tastymenu/tastymenu.spec
+++ b/redhat/applications/tastymenu/tastymenu.spec
@@ -61,11 +61,21 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
+# ACL support
+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
diff --git a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec
index acbee7b52..bd89d6687 100644
--- a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec
+++ b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec
@@ -65,6 +65,15 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
 Requires:	trinity-twin
 
 Obsoletes:	trinity-style-ia-ora < %{version}-%{release}
diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/tdedocker/tdedocker.spec
new file mode 100644
index 000000000..5685e4075
--- /dev/null
+++ b/redhat/applications/tdedocker/tdedocker.spec
@@ -0,0 +1,166 @@
+#
+# spec file for package tdedocker (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.0
+%endif
+%define tde_pkg tdedocker
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		1.4
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Minimize all applications to system tray
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	cmake >= 2.8
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# XKBFILES support
+BuildRequires:	libxkbfile-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+KDocker will help you dock any application into the system tray.
+This means you can dock openoffice, xmms, firefox, thunderbird,
+anything! Just point and click. Works for all NET WM compliant
+window managers - that includes TDE, KDE, GNOME, Xfce, Fluxbox
+and many more.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+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} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -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}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang kdocker
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f kdocker.lang
+%defattr(-,root,root,-)
+%doc AUTHORS BUGS ChangeLog COPYING CREDITS HACKING INSTALL README TODO VERSION
+%{tde_bindir}/kdocker
+%{tde_tdeappdir}/kdocker.desktop
+%{tde_datadir}/apps/kdocker/icons/kdocker.png
+%{tde_datadir}/apps/kdocker/icons/question.png
+
+
+%changelog
diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio-gopher/tdeio-gopher.spec
new file mode 100644
index 000000000..e13482992
--- /dev/null
+++ b/redhat/applications/tdeio-gopher/tdeio-gopher.spec
@@ -0,0 +1,185 @@
+#
+# spec file for package tdeio-gopher (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.0
+%endif
+%define tde_pkg tdeio-gopher
+%define tde_prefix /opt/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.1.4
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	tdeio-slave for the gopher protocol
+Group:		Productivity/Networking/Ftp/Clients
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	cmake >= 2.8
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+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
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+Obsoletes:		trinity-kio-gopher < %{version}-%{release}
+Provides:		trinity-kio-gopher < %{version}-%{release}
+
+
+%description
+Adds support for the "gopher:" protocol
+to Konqueror and other TDE applications.
+
+This enables you to perform gopher searches in Konqueror.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+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} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -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}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%files -f %{tde_pkg}.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/
+
+
+%changelog
diff --git a/redhat/docker/f29/packages b/redhat/docker/f29/packages
index f12133d1d..ddaabadc8 100644
--- a/redhat/docker/f29/packages
+++ b/redhat/docker/f29/packages
@@ -145,6 +145,7 @@ libXtst-devel
 libXv-devel
 libXxf86dga-devel
 libXxf86vm-devel
+libyaz-devel
 libzrtpcpp-devel
 lirc-devel
 lm_sensors-devel
diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64
index 39c03d7fd..78ad5b63b 100644
--- a/redhat/docker/oss150/Dockerfile.x86_64
+++ b/redhat/docker/oss150/Dockerfile.x86_64
@@ -1,4 +1,4 @@
-FROM opensuse:15.0
+FROM opensuse/leap:15.0
 
 ARG TDE_VERSION=14.0.5
 ARG ARCH=x86_64
diff --git a/redhat/docker/oss150/packages b/redhat/docker/oss150/packages
index f8bb820e6..a9f29f93f 100644
--- a/redhat/docker/oss150/packages
+++ b/redhat/docker/oss150/packages
@@ -129,6 +129,7 @@ libwmf-devel
 libwpd-devel
 libxine-devel
 libxslt-devel
+libyaz-devel
 libzrtpcpp-devel
 lilo
 lirc-devel
@@ -139,6 +140,7 @@ Mesa-devel
 Mesa-libGL-devel
 mozilla-nspr-devel
 mysql-devel
+net-tools
 net-tools-deprecated
 NetworkManager-devel
 ocaml
@@ -157,6 +159,7 @@ postgresql-devel
 python-devel
 python-sip-devel
 qt-devel
+rpcgen
 rpm-build
 rsvg-view
 ruby
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
index f02884153..dc4ab5cdb 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
@@ -117,10 +117,9 @@ This package installs the Trinity directory structure.
 %dir %{tde_datadir}/services
 %dir %{tde_datadir}/services/*
 %dir %{tde_datadir}/servicetypes
-%dir %{tde_datadir}/servicetypes/share
-%dir %{tde_datadir}/servicetypes/share/X11
-%dir %{tde_datadir}/servicetypes/share/X11/xkb
-%dir %{tde_datadir}/servicetypes/share/X11/xkb/symbols
+%dir %{tde_datadir}/X11
+%dir %{tde_datadir}/X11/xkb
+%dir %{tde_datadir}/X11/xkb/symbols
 
 %dir %{tde_datadir}/wallpapers
 
@@ -210,7 +209,7 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/services
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/services/tdeconfiguredialog
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/servicetypes
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/servicetypes/share/X11/xkb/symbols
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/X11/xkb/symbols
 
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/wallpapers
 
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index 60d7ee137..984709a6b 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -3634,6 +3634,9 @@ chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxref
 %__rm -rf "%{?buildroot}%{tde_tdedocdir}/HTML/en/tderandrtray"
 %endif
 
+# Remove conflicting doc
+%__rm -rf "%{?buildroot}%{tde_tdedocdir}/HTML/en/tdeioslave/gopher"
+
 # Links duplicate files
 %fdupes "%{?buildroot}%{tde_datadir}"
 
diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec
index 4fb236edc..a70c39b3d 100644
--- a/redhat/main/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec
@@ -190,14 +190,16 @@ BuildRequires:	rubypick
 %if "%{%ruby_archdir}" != ""
 %define ruby_arch %{?ruby_archdir}
 %else
-%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')}
-%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')}
+%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]' || ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')}
 %endif
 %endif
 %endif
 %if 0%{?rhel} == 5 || 0%{?rhel} == 6
 %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')
 %endif
+%if 0%{?pclinuxos}
+%define ruby_arch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')
+%endif
 
 %if "%{?ruby_libdir}" != ""
 %define ruby_rubylibdir %{?ruby_libdir}
@@ -205,7 +207,7 @@ BuildRequires:	rubypick
 %if "%{?rb_libdir}" != ""
 %define ruby_rubylibdir %{?rb_libdir}
 %else
-%{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')}
+%{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]' || ruby -rrbconfig -e 'puts RbConfig::CONFIG["rubylibdir"]')}
 %endif
 %endif
 
@@ -993,6 +995,14 @@ This package contains the development files for the TDE bindings.
 exit 1
 %endif
 
+%if "%{?ruby_rubylibdir}" == ""
+exit 2
+%endif
+
+%if "%{?ruby_arch}" == ""
+exit 3
+%endif
+
 # [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL4/5
 %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
 %__sed -i "qtruby/rubylib/qtruby/Qt.cpp" \