From 6daa307db25e4a9967013152485b93c1d211caec8561cd1080d99c0bd1dffcfb Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Fri, 13 Dec 2013 09:41:27 +0000 Subject: [PATCH] Accepting request 210691 from home:posophe:branches:Base:System - Update to version 2.0.20 - Improve build and release documentation. (README) (Ted Felix) - Fix for Debian bug #719659. Improved handling of systems with large numbers of input layer connections. Better error handling. (connection_list.h connection_list.c inotify_handler.c input_layer.c netlink.c proc.c sock.c acpid.c) (Ted Felix, Ben Winslow) - Update .gitignore for Eclipse. (.gitignore) (Ted Felix) - Remove unused rcacpid from sources - Change systemd for systemd-rpm-macros requirement; full systemd environment is not needed to build - Rename README.SuSE in README.SUSE to fix suse-wrong-suse-capitalisation rpmlint warning OBS-URL: https://build.opensuse.org/request/show/210691 OBS-URL: https://build.opensuse.org/package/show/Base:System/acpid?expand=0&rev=67 --- README.SuSE => README.SUSE | 0 acpid-2.0.19.tar.xz | 3 - acpid-2.0.20.tar.xz | 3 + acpid.changes | 18 ++++++ acpid.spec | 8 +-- rcacpid | 122 ------------------------------------- 6 files changed, 25 insertions(+), 129 deletions(-) rename README.SuSE => README.SUSE (100%) delete mode 100644 acpid-2.0.19.tar.xz create mode 100644 acpid-2.0.20.tar.xz delete mode 100644 rcacpid diff --git a/README.SuSE b/README.SUSE similarity index 100% rename from README.SuSE rename to README.SUSE diff --git a/acpid-2.0.19.tar.xz b/acpid-2.0.19.tar.xz deleted file mode 100644 index a436ffe..0000000 --- a/acpid-2.0.19.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce503bf3f36002b45a465dc8a2490c16c553abd5bc2c1c8ece86247ec281dcde -size 150972 diff --git a/acpid-2.0.20.tar.xz b/acpid-2.0.20.tar.xz new file mode 100644 index 0000000..849f1cf --- /dev/null +++ b/acpid-2.0.20.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a1ebaf52c6bef0f3d6da24a364e5f9401004d60ef4f42ec2a23057799fcf750 +size 151380 diff --git a/acpid.changes b/acpid.changes index 90e0e9b..8714d0f 100644 --- a/acpid.changes +++ b/acpid.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Dec 12 14:49:57 UTC 2013 - p.drouand@gmail.com + +- Update to version 2.0.20 + - Improve build and release documentation. + (README) (Ted Felix) + - Fix for Debian bug #719659. Improved handling of systems with + large numbers of input layer connections. Better error handling. + (connection_list.h connection_list.c inotify_handler.c input_layer.c + netlink.c proc.c sock.c acpid.c) (Ted Felix, Ben Winslow) + - Update .gitignore for Eclipse. + (.gitignore) (Ted Felix) +- Remove unused rcacpid from sources +- Change systemd for systemd-rpm-macros requirement; full systemd + environment is not needed to build +- Rename README.SuSE in README.SUSE to fix suse-wrong-suse-capitalisation + rpmlint warning + ------------------------------------------------------------------- Sat Oct 19 15:06:50 UTC 2013 - p.drouand@gmail.com diff --git a/acpid.spec b/acpid.spec index 1bd9381..a13a3a0 100644 --- a/acpid.spec +++ b/acpid.spec @@ -17,14 +17,14 @@ Name: acpid -Version: 2.0.19 +Version: 2.0.20 Release: 0 Summary: Executes Actions at ACPI Events License: GPL-2.0+ Group: System/Daemons Url: http://tedfelix.com/linux/acpid-netlink.html Source: http://downloads.sourceforge.net/project/acpid2/%{name}-%{version}.tar.xz -Source3: README.SuSE +Source3: README.SUSE Source5: events.power_button Source6: thinkpad_handler Source7: power_button @@ -35,7 +35,7 @@ Source11: sleep_button # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: acpid-makefile.patch -BuildRequires: systemd +BuildRequires: systemd-rpm-macros BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ia64 @@ -99,7 +99,7 @@ touch %{buildroot}%{_localstatedir}/log/acpid %{_sbindir}/acpid %{_sbindir}/kacpimon %{_bindir}/acpi_listen -%doc README.SuSE README Changelog examples +%doc README.SUSE README Changelog examples %{_mandir}/man8/acpid.8.gz %{_mandir}/man8/acpi_listen.8.gz %{_mandir}/man8/kacpimon.8.gz diff --git a/rcacpid b/rcacpid deleted file mode 100644 index fea4a9e..0000000 --- a/rcacpid +++ /dev/null @@ -1,122 +0,0 @@ -#! /bin/bash -# Copyright (c) 2002-2010 SUSE Linux Products GmbH, Nuernberg, Germany. -# All rights reserved. -# -# Authors: Christian Zoz -# Timo Hoenig -# Stefan Seyfried -# -# /etc/init.d/acpid -# and its symbolic link -# /usr/sbin/rcacpid -# -# LSB compliant service control script; see http://www.linuxbase.org/spec/ -# -### BEGIN INIT INFO -# Provides: acpid -# Required-Start: $local_fs -# Required-Stop: $null -# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 -# Short-Description: Listen and dispatch ACPI events from the kernel -# Description: acpid reads events from /proc/acpi/event and dispatches -# them (by SuSE default) to other "users" like powersaved, HAL and IAL. -# Actions for those events are (by SUSE default) configured in the -# powersaved configuration. -# Additionally this start script loads all needed modules. -### END INIT INFO - -# Check for missing binaries (stale symlinks should not happen) -ACPID_BIN=/usr/sbin/acpid -test -x $ACPID_BIN || exit 5 - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v ditto but be verbose in local rc status -# rc_status -v -r ditto and clear the local rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed set local and overall rc status to -# rc_reset clear local rc status (overall remains) -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks -# rc_splash arg sets the boot splash screen to arg (if active) -. /etc/rc.status - -# Reset status of this service -rc_reset - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - user had insufficient privileges -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signaling is not supported) are -# considered a success. - -case "$1" in - start) - if [ ! -d /proc/acpi ] ; then - echo -n "acpid: no ACPI support in kernel" - rc_status -s - rc_exit - fi - - echo -n "Starting acpid " - startproc $ACPID_BIN - rc_status -v - ;; - stop) - echo -n "Shutting down acpid " - killproc -TERM $ACPID_BIN - rc_status -v - ;; - try-restart) - $0 status - if test $? = 0; then - $0 restart - else - rc_reset # Not running is not a failure. - fi - rc_status - ;; - restart) - $0 stop - $0 start - rc_status - ;; - force-reload|reload) - echo -n "Reload service acpid " - killproc -HUP $ACPID_BIN - rc_status -v - ;; - status) - echo -n "Checking for service acpid " - PID=`checkproc -v $ACPID_BIN` - if rc_status ; then - case `cat /proc/$PID/cmdline` in *events.ignore) rc_failed 3 ;; esac - fi - rc_status -v - ;; - probe) - for i in /etc/acpi/events/*; do - test $i -nt /var/run/acpid.pid && echo restart && break - done - ;; - *) - echo "Usage: $0" \ - "{start|stop|status|try-restart|restart|force-reload|reload|probe}" - exit 1 - ;; -esac -rc_exit