X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=acpid.spec;h=130f4f918798988fff3d718019af70e22991ce89;hb=4ce9f8e370903c166f9ce09c4d8dadb301919f59;hp=ad5f8b8176540fa7c63a37705fc5a2112589431f;hpb=5b43d059413d21f1f927a9ae49482d021924220c;p=packages%2Facpid.git diff --git a/acpid.spec b/acpid.spec index ad5f8b8..130f4f9 100644 --- a/acpid.spec +++ b/acpid.spec @@ -2,15 +2,21 @@ # - better event handling in power.sh # - better default configuration of events in /etc/acpi # - processor and fan module support (?) +# - run-parts(8)-like [A-Z...] regexp from Debian for config scan is evil as it +# is locale dependant (http://www.gentoo.org/news/en/gwn/20060522-newsletter.xml#doc_chap2) +# also it does not allow *.conf files (missing "."), which is not backward +# compatible (custom files can be left unprocessed) +# but if patch is made to allow ".", must consider to ignore .rpm{new,old,save} files +# - build and package kacpimon Summary: ACPI Event Daemon Summary(pl.UTF-8): Demon zdarzeń ACPI Name: acpid -Version: 1.0.6 -Release: 2 -License: GPL v2 +Version: 2.0.10 +Release: 11 +License: GPL v2+ Group: Daemons -Source0: http://dl.sourceforge.net/acpid/%{name}-%{version}.tar.gz -# Source0-md5: 5c9b705700df51d232be223b6ab6414d +Source0: http://tedfelix.com/linux/%{name}-%{version}.tar.gz +# Source0-md5: d5dd88bcfaa4a0bf51905e95115da6df Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -18,19 +24,54 @@ Source4: %{name}.button.conf Source5: %{name}.battery.conf Source6: %{name}.button.sh Source7: %{name}.battery.sh -URL: http://acpid.sourceforge.net/ +Source8: %{name}.upstart +Source9: %{name}.service +Source10: %{name}.preconfig +URL: http://tedfelix.com/linux/acpid-netlink.html BuildRequires: rpmbuild(macros) >= 1.268 Requires(post,preun): /sbin/chkconfig -Requires: rc-scripts -Obsoletes: poweracpid -Conflicts: apmd +Requires: rc-scripts >= 0.4.3.0 +Provides: acpi-daemon +Obsoletes: acpi-daemon +Obsoletes: apm-daemon +ExclusiveArch: %{ix86} %{x8664} ia64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description acpid is a daemon that dispatches ACPI events to user-space programs. %description -l pl.UTF-8 -acpid to demon przekazujący zdarzenia ACPI do programów w user-space. +acpid to demon przekazujący zdarzenia ACPI do programów w przestrzeni +użytkownika. + +%package policy +Summary: ACPID policy files +Summary(pl.UTF-8): Pliki z polityką dla ACPID +Group: Daemons +Requires: %{name} = %{version}-%{release} + +%description policy +This package contains scripts and configuration files which allow +ACPID to take action on incoming ACPI events (eg. to run a script that +suspends the system when the power button is pressed). + +Notice: on most current systems you DO NOT want this package +installed, since there are other software packages responsible for +handling ACPI events (one example being gnome-power-manager) and +having ACPID also respond will lead to problems. In such cases ACPID +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). + +Uwaga: na większości obecnych systemów NIE NALEŻY instalować tego +pakietu, gdyż za reagowanie na zdarzenia ACPI są w nich odpowiedzialne +inne programy (np. gnome-power-manager), więc ACPID by tylko +przeszkadzał. W takich przypadkach demon ACPI powinien działać +wyłącznie jako dyspozytor wiadomości. %prep %setup -q @@ -38,24 +79,31 @@ acpid to demon przekazujący zdarzenia ACPI do programów w user-space. %build %{__make} \ CC="%{__cc}" \ - CFLAGS='-Wall -Werror %{rpmcflags} $(DEFS)' + LDFLAGS="%{rpmcflags} %{rpmldflags}" \ + OPT="%{rpmcppflags} %{rpmcflags} -Wno-error" %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 +install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,rc.d/init.d,sysconfig,init},/var/log} \ + $RPM_BUILD_ROOT{%{_sysconfdir}/acpi/{events,actions},%{systemdunitdir}} \ + $RPM_BUILD_ROOT%{_datadir}/%{name} + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +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 +install -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/battery.sh +install %{SOURCE9} $RPM_BUILD_ROOT%{systemdunitdir} +install %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/%{name} > $RPM_BUILD_ROOT/var/log/acpid +rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -63,30 +111,54 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add acpid %service acpid restart "ACPI daemon" +%systemd_post acpid.service %preun if [ "$1" = "0" ]; then %service acpid stop /sbin/chkconfig --del acpid fi +%systemd_preun acpid.service -%triggerpostun -- %{name} <= 1.0.4-3 -%banner -e %{name} << EOF -Default configuration files have changed. -You might want to review your configuration in /etc/acpi -EOF +%postun +%systemd_reload + +%triggerpostun -- %{name} < 2.0.10-11 +if [ -f /etc/sysconfig/acpid ]; then + . /etc/sysconfig/acpid + __PROGRAM_ARGS= + [ "$NETLINK" = "yes" ] && __PROGRAM_ARGS="-n" + [ -n "$CLIENTMAX" ] && __PROGRAM_ARGS="$__PROGRAM_ARGS -C $CLIENTMAX" + if [ -n "$__PROGRAM_ARGS" ]; then + cp -f /etc/sysconfig/acpid{,.rpmsave} + echo >>/etc/sysconfig/acpid + echo "# Added by rpm trigger" >>/etc/sysconfig/acpid + echo "PROGRAM_ARGS=\"$PROGRAM_ARGS $__PROGRAM_ARGS\"" >>/etc/sysconfig/acpid + fi +fi +%systemd_trigger acpid.service %files %defattr(644,root,root,755) -%doc Changelog README TODO +%doc Changelog README TODO TESTPLAN +%attr(755,root,root) %{_sbindir}/acpid +%attr(755,root,root) %{_bindir}/acpi_listen %dir %{_sysconfdir}/acpi %dir %{_sysconfdir}/acpi/events %dir %{_sysconfdir}/acpi/actions %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,missingok) %verify(not md5 mtime size) %{_sysconfdir}/acpi/events/*.conf -%attr(754,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/acpi/actions/*.sh -%attr(755,root,root) %{_sbindir}/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* +%{_mandir}/man8/acpi_listen.8* +%dir %{_datadir}/%{name} +%attr(755,root,root) %{_datadir}/%{name}/acpid.preconfig + +%files policy +%defattr(644,root,root,755) +%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/acpi/events/button +%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/acpi/events/battery +%attr(754,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/acpi/actions/*.sh