- killed systemd and upstart

diff --git a/lxdm.spec b/lxdm.spec
index 07802c7fbb3fbf5db2d0ed924ef45c811e0419dd..266922818a2dadfedfb3766d371adb079b77612c 100644 (file)
--- a/lxdm.spec
+++ b/lxdm.spec
@@ -9,7 +9,6 @@ Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.Xsession
-Source4:       %{name}.upstart
 Patch0:                %{name}-setuid.patch
 Patch1:                greeter-skip-services.patch
 Patch2:                softlockup.patch
@@ -38,10 +37,8 @@ Summary:     Init script for lxdm
 Summary(pl.UTF-8):     Skrypt init dla lxdm-a
 Group:         X11/Applications
 Requires(post,preun):  /sbin/chkconfig
-Requires(post,postun): systemd-units >= 38
 Requires:      %{name} = %{version}-%{release}
 Requires:      rc-scripts >= 0.4.3.0
-Requires:      systemd-units >= 38
 
 %description init
 Init script for lxdm.
@@ -63,20 +60,16 @@ rm -f data/lxdm.conf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,init,pam.d,security} \
-       $RPM_BUILD_ROOT%{systemdunitdir}
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/lxdm
-cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/init/%{name}.conf
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/lxdm
 install -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/Xsession
 touch $RPM_BUILD_ROOT/etc/security/blacklist.lxdm
 
-ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/lxdm.service
-
 %find_lang %{name}
 
 %clean
@@ -85,7 +78,6 @@ rm -rf $RPM_BUILD_ROOT
 %post init
 /sbin/chkconfig --add %{name}
 %service -n %{name} restart
-%systemd_reload
 
 %preun init
 if [ "$1" = "0" ]; then
@@ -94,7 +86,6 @@ if [ "$1" = "0" ]; then
 fi
 
 %postun init
-%systemd_reload
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -121,5 +112,3 @@ fi
 %files init
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
-%{systemdunitdir}/lxdm.service

diff --git a/lxdm.upstart b/lxdm.upstart
deleted file mode 100644 (file)
index 1c255ef..0000000
--- a/lxdm.upstart
+++ /dev/null
@@ -1,9 +0,0 @@
-description "Starts the LXDE Display Manager"
-
-start on local-filesystems and started messagebus
-
-stop on pld.shutdown-started
-
-respawn
-expect fork
-exec /usr/sbin/lxdm -d