summaryrefslogtreecommitdiffstats
path: root/redhat/tdebase/tdebase-14.0.0.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/tdebase/tdebase-14.0.0.spec')
-rw-r--r--redhat/tdebase/tdebase-14.0.0.spec23
1 files changed, 18 insertions, 5 deletions
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index d7c3ac41e..c242ff438 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -56,7 +56,7 @@ Source5: pamd.kscreensaver-trinity%{?dist}
Source6: suse-displaymanagers-tdm
# Fedora 18: use SYSTEMD for TDM startup
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
Source7: tdm.service%{?dist}
%endif
@@ -210,6 +210,17 @@ Requires: redhat-indexhtml
%define tde_aboutpage /usr/share/doc/HTML/index.html
%endif
+# RHEL 7 Theme
+%if 0%{?rhel} == 7
+Requires: redhat-logos
+%define tde_bg /usr/share/backgrounds/day.jpg
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
+
+Requires: redhat-indexhtml
+%define tde_aboutlabel Enterprise Linux 7
+%define tde_aboutpage /usr/share/doc/HTML/index.html
+%endif
+
# Mageia 2 Theme
%if 0%{?mgaversion} == 2
Requires: mageia-theme-Default
@@ -390,8 +401,9 @@ BuildRequires: OpenEXR-devel
%endif
# XSCREENSAVER support
-# Disabled on RHEL4
+# Disabled on RHEL4, RHEL >= 7
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?rhel} == 0 || 0%{?rhel} <= 6
%define with_xscreensaver 1
%if 0%{?rhel} == 5
BuildRequires: xorg-x11-proto-devel
@@ -412,6 +424,7 @@ BuildRequires: libXScrnSaver-devel
BuildRequires: xscreensaver
%endif
%endif
+%endif
# AVAHI support
# Disabled on RHEL4 and RHEL5
@@ -2110,7 +2123,7 @@ already. Most users won't need this.
%if 0%{?suse_version} >= 1210
/usr/lib/X11/displaymanagers/tdm
%endif
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
/usr/lib/systemd/system/tdm.service
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
@@ -3526,7 +3539,7 @@ EOF
# TDM configuration
%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/tdm/tdmrc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
%else
-e "s/^#*MinShowUID=.*/MinShowUID=500/"
@@ -3551,7 +3564,7 @@ EOF
%endif
# Fedora 18: no more SYSV init script, we have to use systemd.
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
%__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
%__sed -i "s|kdm|tdm|g" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
%endif