jskarvad pushed to acpid (f22). "Merge remote-tracking branch 'origin/master' into f22 (..more)"

[notifications at fedoraproject.org]

From d3a7415c18f90288e84fb42d161f525ecc30120d Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 5 Mar 2015 14:23:44 -0500
Subject: Drop sysvinit subpackage in F23+


diff --git a/acpid.spec b/acpid.spec
index 63f1897..850f05a 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -8,7 +8,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 2.0.23
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz
@@ -32,6 +32,7 @@ Requires: systemd
 %description
 acpid is a daemon that dispatches ACPI events to user-space programs.
 
+%if 0%{?fedora} < 23
 %package sysvinit
 Summary: ACPI Event Daemon
 Group: System Environment/Daemons
@@ -40,6 +41,7 @@ Requires(preun): /sbin/service
 
 %description sysvinit
 The acpid-sysvinit contains SysV initscript.
+%endif
 
 %prep
 %setup -q
@@ -67,8 +69,10 @@ install -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/acpi/actions/power.sh
 install -m 644 %{SOURCE5} %{SOURCE7} %{buildroot}%{_unitdir}
 install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid
 
+%if 0%{?fedora} < 23
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid
+%endif
 
 
 %clean
@@ -94,8 +98,10 @@ rm -rf %{buildroot}
 %{_mandir}/man8/acpi_listen.8.gz
 %{_mandir}/man8/kacpimon.8.gz
 
+%if 0%{?fedora} < 23
 %files sysvinit
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/acpid
+%endif
 
 %pre
 if [ "$1" = "2" ]; then
@@ -122,11 +128,16 @@ fi
 	/sbin/chkconfig --del acpid >/dev/null 2>&1 || :
 	/bin/systemctl try-restart acpid.service >/dev/null 2>&1 || :
 
+%if 0%{?fedora} < 23
 %triggerpostun -n %{name}-sysvinit -- %{name} < 2.0.10-2
 	/sbin/chkconfig --add acpid >/dev/null 2>&1 || :
+%endif
 
 
 %changelog
+* Thu Mar 05 2015 Adam Jackson <ajax at redhat.com> 2.0.23-2
+- Drop sysvinit subpackage in F23+
+
 * Tue Aug 26 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 2.0.23-1
 - New version
   Resolves: rhbz#1133263
-- 
cgit v0.10.2


From 57bfcdb787eb3b31b8c9d5d21317ac5958485c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad at redhat.com>
Date: Tue, 19 May 2015 12:08:06 +0200
Subject: Changed PATH to /usr/sbin:/usr/bin in power.sh

  Resolves: rhbz#1192817

diff --git a/acpid.power.sh b/acpid.power.sh
index 5877321..5e0da13 100644
--- a/acpid.power.sh
+++ b/acpid.power.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PATH=/sbin:/bin:/usr/bin
+PATH=/usr/sbin:/usr/bin
 
 # Check session status using systemd
 session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}')
diff --git a/acpid.spec b/acpid.spec
index 850f05a..b47b74d 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -8,7 +8,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 2.0.23
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz
@@ -135,6 +135,10 @@ fi
 
 
 %changelog
+* Tue May 19 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 2.0.23-3
+- Changed PATH to /usr/sbin:/usr/bin in power.sh
+  Resolves: rhbz#1192817
+
 * Thu Mar 05 2015 Adam Jackson <ajax at redhat.com> 2.0.23-2
 - Drop sysvinit subpackage in F23+
 
-- 
cgit v0.10.2


From 60e8ba8c00c22fc19be2f7da385832d09671c287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad at redhat.com>
Date: Tue, 2 Jun 2015 10:17:24 +0200
Subject: Used socket for stdin to support socket activation


diff --git a/acpid.service b/acpid.service
index fef3569..e7d0987 100644
--- a/acpid.service
+++ b/acpid.service
@@ -4,6 +4,7 @@ Documentation=man:acpid(8)
 Requires=acpid.socket
 
 [Service]
+StandardInput=socket
 EnvironmentFile=/etc/sysconfig/acpid
 ExecStart=/usr/sbin/acpid -f $OPTIONS
 
diff --git a/acpid.spec b/acpid.spec
index b47b74d..04efe64 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -8,7 +8,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 2.0.23
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz
@@ -135,6 +135,9 @@ fi
 
 
 %changelog
+* Tue Jun  2 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 2.0.23-4
+- Used socket for stdin to support socket activation
+
 * Tue May 19 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 2.0.23-3
 - Changed PATH to /usr/sbin:/usr/bin in power.sh
   Resolves: rhbz#1192817
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/acpid.git/commit/?h=f22&id=938e19d635894d98eeb5e35782b935d83ceb17cb