[packages/gdm/gdm-3.14] - drop upstart support - rel 4
baggins
baggins at pld-linux.org
Sun May 10 20:45:33 CEST 2015
commit d1aa20877353a551fa185495eb41796fc470246e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun May 10 20:45:06 2015 +0200
- drop upstart support
- rel 4
gdm.init | 2 --
gdm.spec | 20 +-------------------
gdm.upstart | 13 -------------
3 files changed, 1 insertion(+), 34 deletions(-)
---
diff --git a/gdm.spec b/gdm.spec
index 7fcc0e4..39fbb01 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -17,7 +17,7 @@ Summary(ru.UTF-8): Дисплейный менеджер GNOME
Summary(uk.UTF-8): Дисплейний менеджер GNOME
Name: gdm
Version: 3.14.1
-Release: 3
+Release: 4
Epoch: 2
License: GPL/LGPL
Group: X11/Applications
@@ -29,7 +29,6 @@ Source3: %{name}-pld-logo.png
Source4: %{name}-autologin.pamd
Source5: %{name}-custom.desktop
Source6: %{name}-default.desktop
-Source7: %{name}.upstart
Source9: %{name}.tmpfiles
Source10: %{name}-fingerprint.pamd
Source11: %{name}-launch-environment.pamd
@@ -199,19 +198,6 @@ Init script for GDM.
%description init -l pl.UTF-8
Skrypt init dla GDM-a.
-%package upstart
-Summary: Upstart job description for GDM
-Summary(pl.UTF-8): Opis zadania Upstart dla GDM
-Group: Daemons
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: upstart >= 0.6
-
-%description upstart
-Upstart job description for GDM.
-
-%description upstart -l pl.UTF-8
-Opis zadania Upstart dla GDM.
-
%prep
%setup -q
%patch0 -p1
@@ -391,7 +377,3 @@ fi
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/gdm
%{systemdunitdir}/gdm.service
-
-%files upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
diff --git a/gdm.init b/gdm.init
index 2d93dce..13ca65b 100644
--- a/gdm.init
+++ b/gdm.init
@@ -14,8 +14,6 @@
. /etc/rc.d/init.d/functions
-upstart_controlled
-
# Get service config
if [ -f /etc/sysconfig/gdm ]; then
. /etc/sysconfig/gdm
diff --git a/gdm.upstart b/gdm.upstart
deleted file mode 100644
index 21b7c24..0000000
--- a/gdm.upstart
+++ /dev/null
@@ -1,13 +0,0 @@
-description "Starts the Gnome Display Manager"
-
-start on stopped rc RUNLEVEL=5 and started messagebus
-
-# if you have haldaemon present as well:
-#start on pld.sysinit-done and started messagebus and started haldaemon
-#stop on pld.shutdown-started
-stop on starting rc RUNLEVEL=[!5]
-
-respawn
-respawn limit 10 120
-
-exec /usr/sbin/gdm
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gdm.git/commitdiff/d1aa20877353a551fa185495eb41796fc470246e
More information about the pld-cvs-commit
mailing list