- drop upstart support

- rel 16

diff --git a/acpid.spec b/acpid.spec
index 5cdf2b23e4dae49b7549ef376ac5668e72d4b57e..ecdf482ae83c59f9f68215f1d655ae2ec7b47f27 100644 (file)
--- a/acpid.spec
+++ b/acpid.spec
@@ -12,7 +12,7 @@ Summary:      ACPI Event Daemon
 Summary(pl.UTF-8):     Demon zdarzeń ACPI
 Name:          acpid
 Version:       2.0.10
-Release:       15
+Release:       16
 License:       GPL v2+
 Group:         Daemons
 Source0:       http://tedfelix.com/linux/%{name}-%{version}.tar.gz
@@ -24,7 +24,6 @@ Source4:      %{name}.button.conf
 Source5:       %{name}.battery.conf
 Source6:       %{name}.button.sh
 Source7:       %{name}.battery.sh
-Source8:       %{name}.upstart
 Source9:       %{name}.service
 Source10:      %{name}.preconfig
 Patch1:                %{name}-micmute.patch
@@ -98,7 +97,6 @@ install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,rc.d/init.d,sysconfig,init},/var/lo
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/acpid
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/acpid
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/acpid
-cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/init/acpid.conf
 cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/button
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/battery
 install -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/button.sh
@@ -153,7 +151,6 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/acpid
 %attr(754,root,root) /etc/rc.d/init.d/acpid
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/acpid
-%config(noreplace) %verify(not md5 mtime size) /etc/init/acpid.conf
 %{systemdunitdir}/acpid.service
 %attr(640,root,root) %ghost /var/log/acpid
 %{_mandir}/man8/acpid.8*

diff --git a/acpid.upstart b/acpid.upstart
deleted file mode 100644 (file)
index abd6ecc..0000000
--- a/acpid.upstart
+++ /dev/null
@@ -1,40 +0,0 @@
-description "ACPI Event Daemon"
-
-# need syslog, or it will log to console
-start on local-filesystems and started SERVICE_syslog=y
-stop on pld.shutdown-started
-
-respawn
-
-script
-       is_yes() {
-               # Test syntax
-               if [ $# = 0 ]; then
-                       return 2
-               fi
-
-               # Check value
-               case "$1" in
-               yes|Yes|YES|true|True|TRUE|on|On|ON|Y|y|1)
-                       # true returns zero
-                       return 0
-                       ;;
-               *)
-                       # false returns one
-                       return 1
-                       ;;
-               esac
-       }
-
-       if [ -f /etc/sysconfig/acpid ]; then
-               . /etc/sysconfig/acpid
-       fi
-
-       if is_yes "$NETLINK"; then
-               PROGRAM_ARGS="$PROGRAM_ARGS -n"
-       fi
-       if [ "$CLIENTMAX" ]; then
-               PROGRAM_ARGS="$PROGRAM_ARGS -C $CLIENTMAX"
-       fi
-       exec /usr/sbin/acpid -f $PROGRAM_ARGS
-end script