RPM packaging: updates for Fedora 28 / OpenSUSE 15.0

36 files changed, 673 insertions, 39 deletions

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index d9c3454f2..e70f413eb 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -113,7 +113,7 @@ tdelibs:	tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset
 tdemultimedia:	tdebase akode
 	$(call buildpkg,main/tdemultimedia)
 
-tdenetwork:	tdebase
+tdenetwork:	tdebase rdesktop
 	$(call buildpkg,main/tdenetwork)
 
 tdepim:	tdebase libcaldav libcarddav cmake dirmngr
@@ -166,8 +166,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el7*),)
 endif
 
 esound:
-# Build on Mageia and CentOS >= 7 and Fedora >= 23
-ifneq (,$(filter $(DIST),.mga .el7 .fc2 .osstw))
+# Build on Mageia and CentOS >= 7, Fedora >= 23, Opensuse >= 15.0
+ifneq (,$(filter $(DIST),.mga .el7 .fc2 .oss150 .osstw))
 	$(call buildpkg,3rdparty/esound)
 endif
 
@@ -247,7 +247,7 @@ endif
 
 mp4v2:
 # Build on OpenSUSE only
-ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .osstw))
+ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .osstw))
 	$(call buildpkg,3rdparty/mp4v2)
 endif
 
@@ -266,12 +266,24 @@ endif
 python-qt3: tdelibs sip
 	$(call buildpkg,3rdparty/python-qt3)
 
+rdesktop:
+# Build on OpenSUSE >= 15.0 only
+ifneq (,$(filter $(DIST),.oss150))
+	$(call buildpkg,3rdparty/rdesktop)
+endif
+
 rdiff-backup:
 # Only for PCLINUXOS
 ifneq ($(wildcard /etc/pclinuxos-release),)
 	$(call buildpkg,3rdparty/rdiff-backup)
 endif
 
+recode:
+# Build on OpenSUSE >= 15.0 only
+ifneq (,$(filter $(DIST),.oss150))
+	$(call buildpkg,3rdparty/recode)
+endif
+
 sip:
 # Build on CentOS 5 only (vendor-provided SIP is too old)
 ifneq (,$(filter $(DIST),.el5))
@@ -298,7 +310,7 @@ endif
 
 wv2:
 # Do NOT build on Mageia or openSUSE or PCLINUXOS
-ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .osstw .pclos))
+ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .oss150 .osstw .pclos))
 	$(call buildpkg,3rdparty/wv2)
 endif
 
@@ -526,7 +538,7 @@ kmplayer:	tdebase
 kmyfirewall:	tdebase
 	$(call buildpkg,applications/kmyfirewall)
 
-kmymoney:	tdebase
+kmymoney:	tdebase recode
 	$(call buildpkg,applications/kmymoney)
 
 knemo:	tdebase
@@ -612,7 +624,7 @@ ksquirrel:	tdebase libkipi libksquirrel
 
 kstreamripper:	tdebase
 # Do NOT build on Fedora >= 27 (problem with scons and python3)
-ifeq (,$(filter $(DIST),.fc27))
+ifeq (,$(filter $(DIST),.fc27 .oss150))
 	$(call buildpkg,applications/kstreamripper)
 endif
 
@@ -788,7 +800,7 @@ endif
 
 hk_classes:
 # Not on Fedora 27, Opensuse TW
-ifeq (,$(filter $(DIST),.fc27 .osstw))
+ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw))
 	$(call buildpkg,extras/hk_classes)
 endif
 
@@ -811,20 +823,20 @@ kdissert:
 	$(call buildpkg,extras/kdissert)
 
 klamav:
-# Not on Fedora 27, Opensuse TW
-ifeq (,$(filter $(DIST),.fc27 .osstw))
+# Not on Fedora >= 27, Opensuse TW
+ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw))
 	$(call buildpkg,extras/klamav)
 endif
 
 klibido: pan
-# Not on RHEL5
-ifeq (,$(filter $(DIST),.el5))
+# Not on RHEL5, nor recent OpenSUSE
+ifeq (,$(filter $(DIST),.el5 .oss150))
 	$(call buildpkg,extras/klibido)
 endif
 
 knoda: hk_classes
 # Not on Fedora 27, Opensuse TW
-ifeq (,$(filter $(DIST),.fc27 .osstw))
+ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw))
 	$(call buildpkg,extras/knoda)
 endif
 
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index e80a2a2fc..41ef745b8 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -191,7 +191,7 @@ BuildRequires:	libofa-devel
 %if 0%{?mgaversion} && 0%{?mgaversion} <= 2
 BuildRequires:	libtunepimp-devel
 %endif
-%if 0%{?suse_version} && 0%{?suse_version} != 1330
+%if 0%{?suse_version} && 0%{?suse_version} != 1330 && 0%{?suse_version} != 1500
 BuildRequires:	libtunepimp-devel
 %endif
 %if 0%{?fedora} && 0%{?fedora} <= 23
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index 46ff97197..845546a50 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -109,7 +109,7 @@ Requires(postun): coreutils
 Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if 0%{?suse_version} >= 1310
+%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1500
 Requires:		wodim
 REquires:		genisoimage
 %else
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index 498bbd004..1bc3e471b 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -175,8 +175,12 @@ BuildRequires:	libutempter-devel
 
 # POPPLER support
 %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%if 0%{?suse_version} == 1500
+BuildRequires: libpoppler-devel >= 0.12
+%else
 BuildRequires: poppler-devel >= 0.12
 %endif
+%endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}poppler-devel
 %endif
@@ -188,10 +192,12 @@ BuildRequires:	trinity-poppler-devel >= 0.12
 # POSTGRESQL support
 #  Requires 'libpqxx', for kexi-driver-pgqsl
 %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?suse_version} != 1500
 %define with_postgresql 1
 BuildRequires:	postgresql-devel
 BuildRequires:	libpqxx-devel
 %endif
+%endif
 Obsoletes:		trinity-libpqxx
 
 # WPD support
diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
index 64ba896eb..9af509ede 100644
--- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
@@ -15,6 +15,10 @@
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
+%if 0%{?fedora} >= 28
+%global debug_package %{nil}
+%endif
+
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
@@ -97,6 +101,7 @@ you with managing/ripping your preferred streams.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%__rm -f kde.py
 
 
 %build
diff --git a/redhat/applications/kuickshow/kuickshow-14.0.0.spec b/redhat/applications/kuickshow/kuickshow-14.0.0.spec
index a83efca40..1862df13f 100644
--- a/redhat/applications/kuickshow/kuickshow-14.0.0.spec
+++ b/redhat/applications/kuickshow/kuickshow-14.0.0.spec
@@ -84,7 +84,7 @@ BuildRequires:	imlib1-devel
 %endif
 
 # GIF support
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?fedora} >= 28
 BuildRequires:	giflib-devel 
 %else
 BuildRequires:	libungif-devel 
diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec
index cdf54b84e..cf20eb00a 100644
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/qalculate-tde/qalculate-tde.spec
@@ -68,7 +68,7 @@ BuildRequires:	libtool
 
 BuildRequires:	libqalculate-devel >= 0.9.6
 
-%if 0%{?suse_version} == 1330
+%if 0%{?suse_version} == 1330 || 0%{?suse_version} == 1500
 BuildRequires:	cln-devel
 %endif
 
diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 8f36192af..a8cf495ed 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -76,8 +76,12 @@ BuildRequires:	fdupes
 
 # POPPLER support
 %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%if 0%{?suse_version} == 1500
+BuildRequires: libpoppler-devel >= 0.12
+%else
 BuildRequires: poppler-devel >= 0.12
 %endif
+%endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}poppler-devel
 %endif
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 06fafb695..222e0a2ea 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -24,7 +24,7 @@ case "${PKGNAME}" in
   # Most TDE libraries have no prefix
   #"libkdcraw") PREFIX="";;
   # 3rd party dependencies
-  "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
+  "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
   # Extra build stuff
   "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
   # Other
@@ -85,7 +85,7 @@ if [ -n "${DEVEL}" ]; then
 
   # Some other packags NOT having development package
   case "${PKGNAME}" in
-    "autoconf"|"automake"|"cmake"|"cscope"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdiff-backup"|"torsocks") exit 0;;
+    "autoconf"|"automake"|"cmake"|"cscope"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdesktop"|"recode"|"rdiff-backup"|"torsocks") exit 0;;
     "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl"|"kipi-plugins") exit 0;;
   esac
 
diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh
index ec4735d30..16d1468a4 100755
--- a/redhat/build/rpmdist.sh
+++ b/redhat/build/rpmdist.sh
@@ -7,7 +7,7 @@ DIST=""
 
 if [ -r /etc/redhat-release ]; then
   read a b c d e f g < /etc/redhat-release
-elif [ -r /etc/SuSE-release ] || grep -qw "ID=opensuse" "/etc/os-release"; then
+elif [ -r /etc/SuSE-release ] || [ -r /etc/SUSE-brand ] || grep -qw "ID=opensuse" "/etc/os-release"; then
   a="opensuse"
 fi
 
@@ -41,6 +41,8 @@ case $a in
   opensuse)
     if [ -r "/etc/SuSE-release" ]; then
       DIST=".oss$((read l; read a b c; echo ${c//./}) </etc/SuSE-release)"
+    elif [ -r "/etc/SUSE-brand" ]; then
+      DIST=".oss$((read a; read a b c; echo ${c//./}) </etc/SUSE-brand)"
     else
       DIST=".oss"
     fi
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 3902bd64e..763abf773 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -292,6 +292,16 @@ BuildRequires:	%{_lib}fbclient-devel
 %define with_nis 1
 %endif
 
+# RPC support
+%if 0%{?fedora} >= 28 || 0%{?suse_version} == 1500
+%if 0%{?fedora}
+BuildRequires:		libnsl2-devel
+%else
+BuildRequires:		libnsl-devel
+%endif
+BuildRequires:		libtirpc-devel
+%endif
+
 # x86_64 specific stuff
 %if "%{_lib}" != "lib"
 %if 0%{?mdkversion} || ( 0%{?mgaversion} && 0%{?mgaversion} <= 2)
@@ -1312,6 +1322,7 @@ for d in \
 	%{_includedir}/mysql \
 	%{_includedir}/libpng15 \
 	%{_includedir}/libpng16 \
+	%{_includedir}/tirpc \
 ; do
 	if [ -d "${d}" ]; then
 		INCDIRS="${INCDIRS} -I${d}"
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index dfe89e406..21c9545e1 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -83,7 +83,7 @@ BuildRequires:	pth-devel
 %if 0%{?fedora} && 0%{?fedora} <= 26
 BuildRequires:	pth-devel
 %endif
-%if 0%{?suse_version} && 0%{?suse_version} != 1330
+%if 0%{?suse_version} && 0%{?suse_version} != 1330 && 0%{?suse_version} != 1500
 BuildRequires:	libpth-devel
 %endif
 
diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686
new file mode 100644
index 000000000..ccb8d9fce
--- /dev/null
+++ b/redhat/docker/f28/Dockerfile.i686
@@ -0,0 +1,24 @@
+FROM fedora32:28
+
+ARG TDE_VERSION=14.0.4
+ARG ARCH=i686
+
+RUN echo "proxy=http://192.168.111.249:3128" >>"/etc/yum.conf"
+
+# Add RPMFUSION repository
+RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-28.noarch.rpm
+
+# Install Trinity build dependencies
+RUN setarch i686 dnf update -y
+ADD packages /packages
+#RUN setarch i686 dnf install -y texlive-base
+RUN setarch i686 dnf install -y $(</packages)
+
+# Add YUM repository for locally built packages
+ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity
+RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+ADD rpmmacros /home/trinity/.rpmmacros
diff --git a/redhat/docker/f28/Dockerfile.x86_64 b/redhat/docker/f28/Dockerfile.x86_64
new file mode 100644
index 000000000..44f7d21eb
--- /dev/null
+++ b/redhat/docker/f28/Dockerfile.x86_64
@@ -0,0 +1,23 @@
+FROM fedora:28
+
+ARG TDE_VERSION=14.0.4
+ARG ARCH=x86_64
+
+RUN echo "proxy=http://192.168.111.249:3128" >>"/etc/yum.conf"
+
+# Add RPMFUSION repository
+RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-28.noarch.rpm
+
+# Install Trinity build dependencies
+RUN dnf update -y
+ADD packages /packages
+RUN dnf install -y $(</packages)
+
+# Add YUM repository for locally built packages
+ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity
+RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+ADD rpmmacros /home/trinity/.rpmmacros
diff --git a/redhat/docker/f28/packages b/redhat/docker/f28/packages
new file mode 100644
index 000000000..38e58b3cb
--- /dev/null
+++ b/redhat/docker/f28/packages
@@ -0,0 +1,218 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bind-devel
+binutils-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+ccrtp-devel
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+commoncpp2-devel
+cpp
+cppunit-devel
+createrepo
+cryptsetup-devel
+cups-devel
+db4-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gamin-devel
+gcc
+gcc-c++
+gettext-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+heimdal-devel
+hspell-devel
+htdig
+html2ps
+icu
+ImageMagick-devel
+imake
+imlib-devel
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libifp-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libutempter-devel
+libv4l-devel
+libvisual-devel
+libvncserver-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+net-snmp-devel
+net-tools
+NetworkManager-glib-devel
+nspr-devel
+ocaml
+ocaml(compiler)
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+poppler-devel
+postgresql
+postgresql-devel
+pulseaudio-libs-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+sip-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+wireless-tools-devel
+xbase-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f28/rpmbuild.repo b/redhat/docker/f28/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f28/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f28/rpmmacros b/redhat/docker/f28/rpmmacros
new file mode 100644
index 000000000..9126fb2b2
--- /dev/null
+++ b/redhat/docker/f28/rpmmacros
@@ -0,0 +1,3 @@
+%dist .fc28
+%_smp_mflags -j8
+%jobs 8
diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64
new file mode 100644
index 000000000..e7d5cd188
--- /dev/null
+++ b/redhat/docker/oss150/Dockerfile.x86_64
@@ -0,0 +1,23 @@
+FROM opensuse:15.0
+
+ARG TDE_VERSION=14.0.4
+ARG ARCH=x86_64
+
+# Add PACKMAN repository
+RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.0/ packman
+RUN zypper refresh
+
+# Install Trinity build dependencies
+ADD packages /packages
+RUN zypper install -l -y $(</packages)
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity
+RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+ADD rpmmacros /home/trinity/.rpmmacros
+
+# Add YUM repository for locally built packages
+RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH}
+RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH}
+RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
+RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
diff --git a/redhat/docker/oss150/packages b/redhat/docker/oss150/packages
new file mode 100644
index 000000000..aa2be744d
--- /dev/null
+++ b/redhat/docker/oss150/packages
@@ -0,0 +1,182 @@
+alsa-devel
+aspell
+aspell-devel
+audiofile-devel
+automake
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+cln-devel
+clucene-core-devel
+cmake
+createrepo
+cups-devel
+cyrus-sasl-devel
+dbus-1-devel
+dbus-1-glib-devel
+djvulibre
+docbook-utils
+docbook-xsl-stylesheets
+doxygen GraphicsMagick
+dssi-devel
+fdupes
+ffmpeg-devel
+fftw3-devel
+file-devel
+flac-devel
+flex
+freetype-devel
+fribidi-devel
+gamin-devel
+gcc-c++
+giflib-devel
+glu-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf xmlto
+GraphicsMagick-devel
+gsl-devel
+gstreamer-devel
+gstreamer-plugins-base-devel 
+gstreamer-devel
+gtk2-devel
+gtk3-devel
+gtk-doc
+htdig
+html2ps
+hunspell-devel
+ImageMagick-devel
+imlib2-devel
+intltool
+java-1_8_0-openjdk-devel
+libacl-devel
+libart_lgpl-devel
+libavahi-devel
+libavcodec-devel
+libblkid-devel
+libbz2-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcryptsetup-devel
+libcurl-devel
+libdb-4_8-devel
+libdvdread-devel
+libexempi-devel
+libexiv2-devel
+libgadu-devel
+libgpgme-devel
+libgphoto2-devel
+libgpod-devel
+libgssglue-devel
+libical-devel
+libidn-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel 
+libmysqld-devel
+libneon-devel
+libnjb-devel
+libnsl-devel
+libofx-devel
+libotr-devel
+libpisock-devel
+libpng16-devel
+libpoppler-devel
+libpqxx-devel
+libpulse-devel
+libqalculate-devel
+libraw1394-devel
+librsvg-devel
+libsamplerate-devel
+libSDL-devel
+libsmbclient-devel
+libsndfile-devel
+libtag-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtwolame-devel
+libudev-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libxine-devel
+libxslt-devel
+libzrtpcpp-devel
+lilo
+lirc-devel
+make
+makeinfo
+meanwhile-devel
+Mesa-devel
+Mesa-libGL-devel
+mozilla-nspr-devel
+mysql-devel
+net-tools-deprecated
+NetworkManager-devel
+ocaml
+openexr-devel
+opensc
+openslp-devel
+opensp-devel
+pam-devel
+patch
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pkcs11-helper-devel
+pkgconfig(ao)
+postgresql
+postgresql-devel
+python-devel
+python-sip-devel
+qt-devel
+rpm-build
+rsvg-view
+ruby
+ruby-devel
+sane-backends-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sudo
+swig
+sword-devel
+torsocks
+transfig
+udisks2-devel
+unixODBC-devel
+update-desktop-files
+usbutils
+utempter-devel
+valgrind
+wireless-tools
+wv2-devel
+xcb-proto-devel
+xscreensaver
+xscreensaver-data
+xscreensaver-data-extra
+xz-devel
diff --git a/redhat/docker/oss150/rpmmacros b/redhat/docker/oss150/rpmmacros
new file mode 100644
index 000000000..9869e1ec2
--- /dev/null
+++ b/redhat/docker/oss150/rpmmacros
@@ -0,0 +1,3 @@
+%dist .oss150
+%_smp_mflags -j8
+%jobs 8
diff --git a/redhat/docker/oss423/packages b/redhat/docker/oss423/packages
index fe79c5038..b02e68e9e 100644
--- a/redhat/docker/oss423/packages
+++ b/redhat/docker/oss423/packages
@@ -87,7 +87,6 @@ libiw-devel
 libjack-devel
 libjasper-devel
 liblcms-devel
-liblcms2-devel
 liblo-devel
 liblrdf-devel
 libmad-devel
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index 2cd3171c7..e62321a73 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -6,11 +6,12 @@ ARG ARCH=i686
 # Add PACKMAN repository
 RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
 RUN setarch ${ARCH} zypper refresh
+RUN setarch ${ARCH} zypper --non-interactive dup
+RUN setarch ${ARCH} zypper --non-interactive update
 
 # Install Trinity build dependencies
-ADD packages /etc/zypp/packages
-RUN setarch ${ARCH} zypper remove -y openssl
-RUN setarch ${ARCH} zypper install -l -y $(</etc/zypp/packages)
+ADD packages /packages
+RUN setarch ${ARCH} zypper install -l -y $(</packages)
 
 # Add non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index eadab8f65..a4f5d7552 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -6,11 +6,12 @@ ARG ARCH=x86_64
 # Add PACKMAN repository
 RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
 RUN zypper refresh
+RUN zypper --non-interactive dup
+RUN zypper --non-interactive update
 
 # Install Trinity build dependencies
-ADD packages /etc/zypp/packages
-RUN zypper remove -y openssl
-RUN zypper install -l -y $(</etc/zypp/packages)
+ADD packages /packages
+RUN zypper install -l -y $(</packages)
 
 # Add non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 4af3c361a..ab1f81b10 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -12,9 +12,9 @@ ccache
 cdparanoia
 cdparanoia-devel
 chmlib-devel
-cln-devel
 chrpath
 clamav
+cln-devel
 clucene-core-devel
 cmake
 createrepo
@@ -33,6 +33,7 @@ fftw3-devel
 file-devel
 flac-devel
 flex
+font-util
 freetype-devel
 fribidi-devel
 gamin-devel
@@ -54,6 +55,7 @@ htdig
 html2ps
 hunspell-devel
 ImageMagick-devel
+imake
 imlib2-devel
 intltool
 java-1_8_0-openjdk-devel
@@ -73,6 +75,7 @@ libdb-4_8-devel
 libdvdread-devel
 libexempi-devel
 libexiv2-devel
+libfontenc-devel
 libgadu-devel
 libgpgme-devel
 libgphoto2-devel
@@ -94,8 +97,8 @@ libmtp-devel
 libmusicbrainz-devel 
 libneon-devel
 libnjb-devel
-libopenssl-1_1_0-devel
 libofx-devel
+libopenssl-devel
 libotr-devel
 libpisock-devel
 libpng16-devel
@@ -115,13 +118,19 @@ libtiff-devel
 libtool
 libtwolame-devel
 libudev-devel
+libudisks2-devel
 libv4l-devel
 libvisual-devel
 libvorbis-devel
 libwmf-devel
 libwpd-devel
+libXdmcp-devel
 libxine-devel
+libxkbfile-devel
+libXScrnSaver-devel
 libxslt-devel
+libXt-devel
+libXtst-devel
 lilo
 lirc-devel
 make
@@ -136,7 +145,7 @@ openexr-devel
 opensc
 openslp-devel
 opensp-devel
-openssl-1_1_0
+openssl
 pam-devel
 patch
 pciutils-devel
@@ -147,7 +156,7 @@ postgresql
 postgresql-devel
 python-devel
 python-sip-devel
-recode
+rpcgen
 rpm-build
 rsvg-view
 ruby
@@ -162,7 +171,6 @@ swig
 sword-devel
 torsocks
 transfig
-udisks2-devel
 unixODBC-devel
 update-desktop-files
 usbutils
diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
index 4786651ab..9b7f80e36 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
@@ -96,10 +96,9 @@ BuildRequires:	OpenEXR-devel
 BuildRequires:	libtiff-devel
 
 # GIF support
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?fedora} >= 28
 BuildRequires:	giflib-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel}
+%else
 BuildRequires:	libungif-devel
 %endif
 
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc28 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc28
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc28
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc28 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc28
new file mode 100644
index 000000000..0616e66f6
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc28
@@ -0,0 +1,16 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+-session    optional    pam_ck_connector.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+session    include     postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc28 b/redhat/main/tdebase/pamd.kdm-trinity.fc28
new file mode 100644
index 000000000..4e760760f
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kdm-trinity.fc28
@@ -0,0 +1,23 @@
+#%PAM-1.0
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth       required    pam_env.so
+auth       substack    system-auth
+-auth       optional    pam_gnome_keyring.so
+-auth       optional    pam_kwallet.so
+-auth       optional    pam_kwallet5.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+-session    optional    pam_ck_connector.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+-session    optional    pam_gnome_keyring.so auto_start
+-session    optional    pam_kwallet.so
+-session    optional    pam_kwallet5.so
+session    include     postlogin
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc28 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc28
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc28
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index 2003bcf57..bc3c29666 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -224,6 +224,14 @@ Requires:	fedora-logos
 %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
 %endif
 
+# Fedora 28 Theme
+%if 0%{?fedora} == 28
+Requires:	f28-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f27/default/standard/f28.png
+Requires:	fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
 # RHEL 4 Theme
 %if 0%{?rhel} == 4
 Requires:	desktop-backgrounds-basic
@@ -363,6 +371,14 @@ Requires:	hicolor-icon-theme-branding
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
+# OpenSuse 15.0 Theme
+%if "%{?suse_version}" == "1500"
+Requires:	wallpaper-branding
+%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
+Requires:	hicolor-icon-theme-branding
+%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
+%endif
+
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
@@ -683,6 +699,12 @@ BuildRequires:	libconfig-devel
 BuildRequires:		libr-devel >= 0.6.0
 %endif
 
+# RPC support
+%if 0%{?fedora} >= 28
+BuildRequires:		libtirpc-devel
+BuildRequires:		rpcgen
+%endif
+
 # tdebase is a metapackage that installs all sub-packages
 Requires: %{name}-runtime-data-common = %{version}-%{release}
 Requires: %{name}-data = %{version}-%{release}
@@ -3280,6 +3302,11 @@ if [ -d "/usr/include/openldap24" ]; then
   RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
 fi
 
+# libtirpc (fedora)
+if [ -d "/usr/include/tirpc" ]; then
+  RPM_OPT_FLAGS="$(pkg-config --cflags --libs libtirpc) ${RPM_OPT_FLAGS}"
+fi
+
 if ! rpm -E %%cmake|grep -q "cd build"; then
   %__mkdir_p build
   cd build
diff --git a/redhat/main/tdebase/tdm.fc28.pp b/redhat/main/tdebase/tdm.fc28.pp
new file mode 100644
index 000000000..d0c0d4be8
--- /dev/null
+++ b/redhat/main/tdebase/tdm.fc28.pp
diff --git a/redhat/main/tdebase/tdm.service.fc28 b/redhat/main/tdebase/tdm.service.fc28
new file mode 100644
index 000000000..4c6136d94
--- /dev/null
+++ b/redhat/main/tdebase/tdm.service.fc28
@@ -0,0 +1,12 @@
+[Unit]
+Description=The Trinity login manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/opt/trinity/bin/kdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec
index 3cfbabaeb..47ca29d7e 100644
--- a/redhat/main/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec
@@ -999,6 +999,13 @@ exit 1
 %__sed -i "xparts/Makefile.am" \
        -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
 
+# Fix Fedora >= 28 automatic invalid dependency to '/usr/bin/kjscmd'
+%if 0%{?fedora} >= 28
+%__sed -i "kjsembed/tdescript/swaptabs.js" \
+       -i "kjsembed/stdlib/cmdline.js" \
+       -e "s|/usr/bin/env kjscmd|%{tde_bindir}/kjscmd|"
+%endif
+
 %__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"
diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec
index 26d8ede69..bbfd7b881 100644
--- a/redhat/main/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec
@@ -94,7 +94,7 @@ BuildRequires: ocaml
 
 # KIG python scripting support
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%if 0%{?suse_version} == 1330
+%if 0%{?suse_version} == 1330 || 0%{?suse_version} == 1500
 %define with_kig 0
 %else
 %define with_kig 1
diff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
index 5f957cf4d..85e91ba05 100644
--- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
@@ -100,7 +100,7 @@ BuildRequires: pcre-devel
 BuildRequires:	libacl-devel
 
 # GIF support
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?fedora} >= 28
 BuildRequires: giflib-devel
 %else
 BuildRequires: libungif-devel
@@ -198,8 +198,12 @@ BuildRequires:	OpenEXR-devel
 %define with_pdf 1
 %if 0%{?with_pdf}
 %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%if 0%{?suse_version} == 1500
+BuildRequires: libpoppler-devel >= 0.12
+%else
 BuildRequires: poppler-devel >= 0.12
 %endif
+%endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}poppler-devel
 %endif
diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec
index 1c7d5e619..76bc247a6 100644
--- a/redhat/main/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec
@@ -371,7 +371,7 @@ Requires:		udisks
 # UDISKS2 support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
 %define with_udisks2 1
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1550
 BuildRequires:	libudisks2-devel
 %else
 BuildRequires:	udisks2-devel