From 448afab9b6033a2215f485955d5cf977f102769c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Tue, 18 Aug 2015 22:52:30 +0900
Subject: [PATCH] - drop upstart support - rel 2

---
 console.upstart | 18 ------------------
 kbd.spec        |  7 ++-----
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 console.upstart

diff --git a/console.upstart b/console.upstart
deleted file mode 100644
index 15c31af..0000000
--- a/console.upstart
+++ /dev/null
@@ -1,18 +0,0 @@
-description "Loads console font and keyboard table"
-
-start on pld.sysinit-done
-
-task
-console output
-
-pre-start script
-	[ -f /etc/sysconfig/console ] || exit 0
-
-	[ -f /bin/loadkeys -o -f /usr/bin/loadkeys ]
-	[ -f /bin/setfont -o -f /usr/bin/setfont ]
-end script
-
-script
-	export USE_UPSTART=no
-	exec /etc/rc.d/init.d/console start >/dev/null
-end script
diff --git a/kbd.spec b/kbd.spec
index 8708acd..a93e293 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -12,7 +12,7 @@ Summary(ko.UTF-8):	콘솔을 설정하는 도구 (글쇠판, 가상 터미널, 
 Summary(pl.UTF-8):	Narzędzia do obsługi konsoli
 Name:		kbd
 Version:	2.0.3
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/Console
 Source0:	ftp://ftp.altlinux.org/pub/people/legion/kbd/%{name}-%{version}.tar.gz
@@ -33,7 +33,6 @@ Source8:	%{name}-pl1.kmap
 Source9:	%{name}-mac-pl.kmap
 Source10:	%{name}-pl3.map
 Source11:	%{name}-pl4.map
-Source12:	console.upstart
 Patch0:		%{name}-unicode_start.patch
 Patch1:		%{name}-tty-detect.patch
 URL:		http://kbd-project.org/
@@ -146,7 +145,7 @@ Statyczna biblioteka libkeymap.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/bin,/etc/{profile.d,rc.d/init.d,sysconfig,init}}
+install -d $RPM_BUILD_ROOT{/bin,/etc/{profile.d,rc.d/init.d,sysconfig}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -173,7 +172,6 @@ ln -sf $(basename $RPM_BUILD_ROOT/%{_lib}/libkeymap.so.*.*.*) $RPM_BUILD_ROOT%{_
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/console
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/console
-cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/init/console.conf
 %ifarch sparc sparc64
 %{__sed} -i -e 's/KEYTABLE=pl2/KEYTABLE=sunkeymap/' $RPM_BUILD_ROOT/etc/sysconfig/console
 %endif
@@ -221,7 +219,6 @@ fi
 %doc AUTHORS COPYING CREDITS ChangeLog README docs/doc/kbd.FAQ.txt
 %attr(754,root,root) /etc/rc.d/init.d/console
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/console
-%config(noreplace) %verify(not md5 mtime size) /etc/init/console.conf
 %attr(755,root,root) /etc/profile.d/console.csh
 %attr(755,root,root) /etc/profile.d/console.sh
 
-- 
2.44.0