diff options
| author | François Andriot <[email protected]> | 2014-07-14 00:03:38 +0200 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2014-07-14 00:03:38 +0200 |
| commit | c6eec582c412347deeb9681922c1c204c49d74b0 (patch) | |
| tree | 35cfbbaab3b012adda6cbeeb2df96d926ddde418 /redhat/tdebase | |
| parent | 2df1d237581f87abb0cf8da09e8faf984c26e8db (diff) | |
| download | tde-packaging-c6eec582c412347deeb9681922c1c204c49d74b0.tar.gz tde-packaging-c6eec582c412347deeb9681922c1c204c49d74b0.zip | |
RPM Packaging: build 3.5.13.2 for CentOS 7
Diffstat (limited to 'redhat/tdebase')
| -rw-r--r-- | redhat/tdebase/tdebase-3.5.13.2.spec | 4 | ||||
| -rw-r--r-- | redhat/tdebase/tdm.el7.pp | bin | 936 -> 931 bytes | |||
| -rw-r--r-- | redhat/tdebase/tdm.el7.te | 11 |
3 files changed, 14 insertions, 1 deletions
diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec index 83e9502a9..2de34ad5e 100644 --- a/redhat/tdebase/tdebase-3.5.13.2.spec +++ b/redhat/tdebase/tdebase-3.5.13.2.spec @@ -446,6 +446,7 @@ BuildRequires: OpenEXR-devel # XSCREENSAVER support # 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 @@ -466,6 +467,7 @@ BuildRequires: libXScrnSaver-devel BuildRequires: xscreensaver %endif %endif +%endif # AVAHI support # Disabled on RHEL4 and RHEL5 @@ -3601,7 +3603,7 @@ EOF # TDM configuration %__sed -i "%{?buildroot}%{_sysconfdir}/trinity/kdm/kdmrc" \ -%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/" diff --git a/redhat/tdebase/tdm.el7.pp b/redhat/tdebase/tdm.el7.pp Binary files differindex dec162d22..855c3860d 100644 --- a/redhat/tdebase/tdm.el7.pp +++ b/redhat/tdebase/tdm.el7.pp diff --git a/redhat/tdebase/tdm.el7.te b/redhat/tdebase/tdm.el7.te index e69de29bb..1c721d90b 100644 --- a/redhat/tdebase/tdm.el7.te +++ b/redhat/tdebase/tdm.el7.te @@ -0,0 +1,11 @@ + +module tdm.el7 1.0; + +require { + type fprintd_t; + type init_t; + class dbus send_msg; +} + +#============= fprintd_t ============== +allow fprintd_t init_t:dbus send_msg; |