diff options
| author | François Andriot <albator78@libertysurf.fr> | 2020-01-18 20:25:10 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2020-01-18 20:29:30 +0100 |
| commit | 685d3568bfc83de6ab77e5f817edb1d3514db323 (patch) | |
| tree | 3117025b53d311ef9be0142b4d33472c1e962c7e /redhat/main | |
| parent | 43ce0a2b329dbb0b4575e19f8b456c838d117b16 (diff) | |
| download | tde-packaging-685d3568bfc83de6ab77e5f817edb1d3514db323.tar.gz tde-packaging-685d3568bfc83de6ab77e5f817edb1d3514db323.zip | |
RPM: various update to build 14.0.7
Diffstat (limited to 'redhat/main')
| -rw-r--r-- | redhat/main/tdebase/tdebase.spec | 1 | ||||
| -rw-r--r-- | redhat/main/tdebase/tdm.service.el7 | 2 | ||||
| -rw-r--r-- | redhat/main/tdebase/tdm.service.fc30 | 2 | ||||
| -rw-r--r-- | redhat/main/tdebase/tdm.service.fc31 | 2 | ||||
| -rw-r--r-- | redhat/main/tdelibs/tdelibs.spec | 5 |
5 files changed, 4 insertions, 8 deletions
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index 675f530b7..7bf154950 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -3564,7 +3564,6 @@ fi # Fedora 18 / RHEL 7: no more SYSV init script, we have to use systemd to launch TDM. %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 # SELINUX policy for RHEL / Fedora diff --git a/redhat/main/tdebase/tdm.service.el7 b/redhat/main/tdebase/tdm.service.el7 index 4c6136d94..9ef7e07ff 100644 --- a/redhat/main/tdebase/tdm.service.el7 +++ b/redhat/main/tdebase/tdm.service.el7 @@ -4,7 +4,7 @@ Conflicts=getty@tty1.service After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service [Service] -ExecStart=/opt/trinity/bin/kdm +ExecStart=/opt/trinity/bin/tdm Restart=always IgnoreSIGPIPE=no diff --git a/redhat/main/tdebase/tdm.service.fc30 b/redhat/main/tdebase/tdm.service.fc30 index 4c6136d94..9ef7e07ff 100644 --- a/redhat/main/tdebase/tdm.service.fc30 +++ b/redhat/main/tdebase/tdm.service.fc30 @@ -4,7 +4,7 @@ Conflicts=getty@tty1.service After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service [Service] -ExecStart=/opt/trinity/bin/kdm +ExecStart=/opt/trinity/bin/tdm Restart=always IgnoreSIGPIPE=no diff --git a/redhat/main/tdebase/tdm.service.fc31 b/redhat/main/tdebase/tdm.service.fc31 index 4c6136d94..9ef7e07ff 100644 --- a/redhat/main/tdebase/tdm.service.fc31 +++ b/redhat/main/tdebase/tdm.service.fc31 @@ -4,7 +4,7 @@ Conflicts=getty@tty1.service After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service [Service] -ExecStart=/opt/trinity/bin/kdm +ExecStart=/opt/trinity/bin/tdm Restart=always IgnoreSIGPIPE=no diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec index 5d6073f76..c0b3e2f0a 100644 --- a/redhat/main/tdelibs/tdelibs.spec +++ b/redhat/main/tdelibs/tdelibs.spec @@ -358,7 +358,7 @@ BuildRequires: libudev-devel %endif # UDISKS support -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6 +%if 0%{?rhel} == 6 %if 0%{?pclinuxos} == 0 && 0%{?suse_version} <= 1310 %define with_udisks 1 BuildRequires: udisks-devel @@ -366,9 +366,6 @@ Requires: udisks %endif %endif -# PMOUNT support -#Requires: pmount - # UDISKS2 support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7 %define with_udisks2 1 |