Author: blues Date: Sun Feb 5 22:23:12 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel.6 - systemd
---- Files affected: packages/acpid: acpid.spec (1.79 -> 1.80) , acpid.service (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/acpid/acpid.spec diff -u packages/acpid/acpid.spec:1.79 packages/acpid/acpid.spec:1.80 --- packages/acpid/acpid.spec:1.79 Sun Jan 29 19:35:53 2012 +++ packages/acpid/acpid.spec Sun Feb 5 23:23:07 2012 @@ -13,7 +13,7 @@ Summary(pl.UTF-8): Demon zdarzeń ACPI Name: acpid Version: 2.0.10 -Release: 5 +Release: 6 License: GPL v2+ Group: Daemons Source0: http://tedfelix.com/linux/%{name}-%{version}.tar.gz @@ -26,6 +26,7 @@ Source6: %{name}.button.sh Source7: %{name}.battery.sh Source8: %{name}.upstart +Source9: %{name}.service URL: http://tedfelix.com/linux/acpid-netlink.html BuildRequires: rpmbuild(macros) >= 1.268 Requires(post,preun): /sbin/chkconfig @@ -84,7 +85,7 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,rc.d/init.d,sysconfig,init},/var/log} \ - $RPM_BUILD_ROOT%{_sysconfdir}/acpi/{events,actions} + $RPM_BUILD_ROOT{%{_sysconfdir}/acpi/{events,actions},%{systemdunitdir}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -97,6 +98,8 @@ 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} + > $RPM_BUILD_ROOT/var/log/acpid rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} @@ -106,12 +109,17 @@ %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 + +%postun +%systemd_reload %triggerpostun -- %{name} < 1.0.4-4 %banner -e %{name} << 'EOF' @@ -147,6 +155,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.80 2012/02/05 22:23:07 blues +- rel.6 - systemd + Revision 1.79 2012/01/29 18:35:53 glen - release 5 ================================================================ Index: packages/acpid/acpid.service diff -u /dev/null packages/acpid/acpid.service:1.1 --- /dev/null Sun Feb 5 23:23:13 2012 +++ packages/acpid/acpid.service Sun Feb 5 23:23:07 2012 @@ -0,0 +1,12 @@ +[Unit] +Description=System ACPI Daemon +After=syslog.service + +[Service] +EnvironmentFile=/etc/sysconfig/acpid +ExecStart=/sbin/service acpid start +ExecStop=/sbin/service acpid stop +Type=forking + +[Install] +WantedBy=multi-user.target ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/acpid/acpid.spec?r1=1.79&r2=1.80&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
