[packages/acpid] - drop upstart support - rel 16

baggins baggins at pld-linux.org
Tue Aug 18 15:35:35 CEST 2015


commit 20309fc3a8f62a01d46c29e0a58ca0dc12b82739
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Aug 18 22:35:07 2015 +0900

    - drop upstart support
    - rel 16

 acpid.spec    |  5 +----
 acpid.upstart | 40 ----------------------------------------
 2 files changed, 1 insertion(+), 44 deletions(-)
---
diff --git a/acpid.spec b/acpid.spec
index 5cdf2b2..ecdf482 100644
--- 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
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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/acpid.git/commitdiff/20309fc3a8f62a01d46c29e0a58ca0dc12b82739



More information about the pld-cvs-commit mailing list