- pass ld flags, install and package acpi_listen

- todo about netlink based acpid 2.0.3

Changed files:
    acpid.spec -> 1.66

diff --git a/acpid.spec b/acpid.spec
index f42d589b47bb8e0c893d342142070000aef708a0..fb09e48e722fa29ec5a9e7df65aa5f8a2e112e8a 100644 (file)
--- a/acpid.spec
+++ b/acpid.spec
@@ -2,6 +2,9 @@
 # - better event handling in power.sh
 # - better default configuration of events in /etc/acpi
 # - processor and fan module support (?)
+# - ignore .rpmnew,.rpmsave,...
+# - try acpid via netlink:
+#   http://tedfelix.com/linux/acpid-netlink.html, http://tedfelix.com/linux/acpid-2.0.3.tar.gz
 Summary:       ACPI Event Daemon
 Summary(pl.UTF-8):     Demon zdarzeń ACPI
 Name:          acpid
@@ -9,7 +12,7 @@ Version:       1.0.10
 Release:       1
 License:       GPL v2+
 Group:         Daemons
-Source0:       http://dl.sourceforge.net/acpid/%{name}-%{version}.tar.gz
+Source0:       http://downloads.sourceforge.net/acpid/%{name}-%{version}.tar.gz
 # Source0-md5: 61156ef32015c56dc0f2e3317f4ae09e
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
@@ -53,9 +56,9 @@ should only act as a message broker.
 
 %description policy -l pl.UTF-8
 Ten pakiet zawiera skrypty i pliki konfiguracyjne, które umożliwiają
-demonowi ACPI wykonywanie operacji na podstawie przychodzących
-zdarzeń ACPI (np. uruchomienie skryptu usypiającego system, gdy
-użytkownik naciśnie przycisk zasilania).
+demonowi ACPI wykonywanie operacji na podstawie przychodzących zdarzeń
+ACPI (np. uruchomienie skryptu usypiającego system, gdy użytkownik
+naciśnie przycisk zasilania).
 
 Uwaga: na większości obecnych systemów NIE NALEŻY instalować tego
 pakietu, gdyż za reagowanie na zdarzenia ACPI są w nich odpowiedzialne
@@ -69,23 +72,24 @@ wyłącznie jako dyspozytor wiadomości.
 %build
 %{__make} \
        CC="%{__cc}" \
+       LDFLAGS="%{rpmldflags}" \
        CFLAGS='-Wall -Werror %{rpmcflags} -D_GNU_SOURCE $(DEFS)'
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{logrotate.d,rc.d/init.d,sysconfig},/var/log} \
-       $RPM_BUILD_ROOT{%{_sysconfdir}/acpi/{events,actions},%{_sbindir},%{_mandir}/man8}
-
-install acpid $RPM_BUILD_ROOT%{_sbindir}
-install acpid.8 $RPM_BUILD_ROOT%{_mandir}/man8
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/acpid
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/acpid
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/acpid
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/button.conf
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/battery.conf
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/button.sh
-install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/battery.sh
-
+       $RPM_BUILD_ROOT{%{_sysconfdir}/acpi/{events,actions},%{_sbindir},%{_bindir},%{_mandir}/man8}
+
+install -p acpid $RPM_BUILD_ROOT%{_sbindir}
+install -p acpi_listen $RPM_BUILD_ROOT%{_bindir}
+cp -a acpid.8 acpi_listen.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/acpid
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/acpid
+cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/acpid
+cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/button.conf
+cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/battery.conf
+install -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/button.sh
+install -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/battery.sh
 > $RPM_BUILD_ROOT/var/log/acpid
 
 %clean
@@ -111,6 +115,7 @@ EOF
 %defattr(644,root,root,755)
 %doc Changelog README TODO
 %attr(755,root,root) %{_sbindir}/acpid
+%attr(755,root,root) %{_bindir}/acpi_listen
 %dir %{_sysconfdir}/acpi
 %dir %{_sysconfdir}/acpi/events
 %dir %{_sysconfdir}/acpi/actions
@@ -119,6 +124,7 @@ EOF
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/acpid
 %attr(640,root,root) %ghost /var/log/acpid
 %{_mandir}/man8/acpid.8*
+%{_mandir}/man8/acpi_listen.8*
 
 %files policy
 %defattr(644,root,root,755)