1 files changed, 26 insertions, 2 deletions
diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec
index b8f3cc267..884f86b9d 100644
--- a/redhat/tdebase/tdebase-3.5.13.2.spec
+++ b/redhat/tdebase/tdebase-3.5.13.2.spec
@@ -74,8 +74,14 @@ Source7:	tdm.service%{?dist}
 Source7:	xdm.oss114
 %endif
 
-# Fedora 17: special selinux policy required
-%if 0%{?fedora} == 17 ||0%{?fedora} == 19 || 0%{?rhel} == 6
+# Fedora >= 17: special selinux policy required for TDM
+#  If login through TDM takes ages, then look at '/var/log/audit/audit.log'.
+#  Locate the line containing 'USER_AVC' and dbus stuff.
+#  Put this line into a temporary file, then (e.g for Fedora 17):
+#   audit2allow -i /tmp/file -m tdm.fc17 >tdm.fc17.te
+#   audit2allow -i /tmp/file -M tdm.fc17
+
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
 %define with_selinux_policy 1
 Source8:	tdm%{?dist}.pp
 %endif
@@ -192,6 +198,18 @@ Requires:	fedora-release-notes
 %define tde_aboutpage /usr/share/doc/fedora-release-notes-19/index.html
 %endif
 
+# Fedora 20 Theme: "Heisenburg"
+%if 0%{?fedora} == 20
+Requires:	heisenbug-backgrounds-base
+%define tde_bg /usr/share/backgrounds/heisenbug/default/standard/heisenbug.png
+Requires:	fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+
+Requires:	fedora-release-notes
+%define tde_aboutlabel Fedora 20
+%define tde_aboutpage /usr/share/doc/fedora-release-notes/index.html
+%endif
+
 # RHEL 4 Theme
 %if 0%{?rhel} == 4
 Requires:	desktop-backgrounds-basic
@@ -349,7 +367,12 @@ BuildRequires:	glib2-devel
 BuildRequires:	pcre-devel
 
 # SASL support
+%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+BuildRequires:	%{_lib}sasl2-devel
+%endif
+%if 0%{?suse_version}
 BuildRequires:	cyrus-sasl-devel
+%endif
 
 # LIBUSB support
 BuildRequires:	pam-devel
@@ -3544,6 +3567,7 @@ EOF
 # Fedora 18: no more SYSV init script, we have to use systemd.
 %if 0%{?fedora} >= 18
 %__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
+%__sed -i "s|tdm|kdm|g" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
 %endif
 
 # Symlink TDM configuration