Accepting request 79717 from Base:System

- Use systemd macros to enable acpid service.

OBS-URL: https://build.opensuse.org/request/show/79717
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/acpid?expand=0&rev=45
This commit is contained in:
Sascha Peilicke 2011-08-25 09:01:36 +00:00 committed by Git OBS Bridge
commit 035eb1a6e2
2 changed files with 19 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Aug 24 16:30:58 UTC 2011 - fcrozat@suse.com
- Use systemd macros to enable acpid service.
-------------------------------------------------------------------
Tue Aug 23 12:07:59 UTC 2011 - aj@suse.de

View File

@ -38,7 +38,9 @@ Source7: power_button
Source8: acpid.service
Patch1: acpid-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: systemd
ExclusiveArch: %ix86 x86_64 ia64
%systemd_requires
%description
ACPID is a completely flexible, totally extensible daemon for
@ -76,8 +78,8 @@ mkdir -p %{buildroot}/usr/sbin
ln -sf ../../etc/init.d/acpid %{buildroot}/usr/sbin/rcacpid
install -Dm 644 events.power_button %{buildroot}/etc/acpi/events/power_button
install -Dm 644 events.thinkpad %{buildroot}/etc/acpi/events/thinkpad
mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/lib/systemd/system
mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_unitdir}
# for the rpmlint fascists
mv samples examples
@ -88,15 +90,23 @@ touch %buildroot%_var/log/acpid
%clean
rm -rf %{buildroot}
%pre
%service_migrate_to_systemd_pre acpid
%post
%{fillup_and_insserv -y -f acpid}
%service_migrate_to_systemd_post acpid
%service_add acpid.service
%postun
%restart_on_update acpid
%{insserv_cleanup}
%service_migrate_to_systemd_postun acpid
%service_del_postun acpid.service
%preun
%preun
%stop_on_removal acpid
%service_del_preun acpid.service
%files
%defattr(-,root,root)
@ -108,7 +118,7 @@ rm -rf %{buildroot}
/usr/lib/acpid
/etc/init.d/acpid
/etc/modprobe.d/50-thinkpad_acpi.conf
/lib/systemd/system/%{name}.service
%_unitdir/%{name}.service
/usr/sbin/rcacpid
/sbin/acpid
/usr/bin/acpi_listen