Accepting request 180075 from home:elvigia:branches:Base:System

- at.sleep move away from pm-utils to systemd-sleep

OBS-URL: https://build.opensuse.org/request/show/180075
OBS-URL: https://build.opensuse.org/package/show/Base:System/at?expand=0&rev=63
This commit is contained in:
Michal Vyskocil 2013-06-20 11:55:35 +00:00 committed by Git OBS Bridge
parent fdcefcf73d
commit cb2d49fe74
3 changed files with 16 additions and 20 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jun 20 01:52:46 UTC 2013 - crrodriguez@opensuse.org
- at.sleep move away from pm-utils to systemd-sleep
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 18 15:09:18 UTC 2013 - schwab@suse.de Tue Jun 18 15:09:18 UTC 2013 - schwab@suse.de

View File

@ -1,16 +1,9 @@
#!/bin/bash #!/bin/sh
case $1/$2 in
. $PM_UTILS_LIBDIR/functions pre/*)
systemctl --quiet is-enabled atd && systemctl stop atd
case "$1" in ;;
hibernate|suspend) post/*)
stopservice atd systemctl --quiet is-enabled atd && systemctl restart atd
;; ;;
thaw|resume)
restartservice atd
;;
*)
;;
esac esac
exit 0

View File

@ -66,7 +66,7 @@ Recommends: smtp_daemon
%if 0%{?suse_version} > 1140 %if 0%{?suse_version} > 1140
BuildRequires: libHX-devel BuildRequires: libHX-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: systemd BuildRequires: pkgconfig(systemd)
%{?systemd_requires} %{?systemd_requires}
%define has_systemd 1 %define has_systemd 1
%endif %endif
@ -119,9 +119,9 @@ install %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/atd
ln -sf ../../etc/init.d/atd $RPM_BUILD_ROOT%{_sbindir}/rcatd ln -sf ../../etc/init.d/atd $RPM_BUILD_ROOT%{_sbindir}/rcatd
install -m644 %SOURCE2 $RPM_BUILD_ROOT/etc/pam.d/atd install -m644 %SOURCE2 $RPM_BUILD_ROOT/etc/pam.d/atd
install -m644 %SOURCE3 $RPM_BUILD_ROOT/var/adm/fillup-templates install -m644 %SOURCE3 $RPM_BUILD_ROOT/var/adm/fillup-templates
%{__install} -D -m 0755 %{S:4} %{buildroot}%{_sysconfdir}/pm/sleep.d/99%{name}
%if 0%{?has_systemd} %if 0%{?has_systemd}
install -D -m 0644 %{S:5} %{buildroot}%{_unitdir}/atd.service install -D -m 0644 %{S:5} %{buildroot}%{_unitdir}/atd.service
%{__install} -D -m 0755 %{S:4} %{buildroot}%{_prefix}/lib/systemd/system-sleep/atd.sh
%endif %endif
%pre %pre
@ -163,9 +163,6 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%doc Problems Copyright COPYING README ChangeLog timespec %doc Problems Copyright COPYING README ChangeLog timespec
%config(noreplace) /etc/at.deny %config(noreplace) /etc/at.deny
%dir %{_sysconfdir}/pm
%dir %{_sysconfdir}/pm/sleep.d
%config %{_sysconfdir}/pm/sleep.d/99%{name}
%{_sbindir}/rcatd %{_sbindir}/rcatd
%config /etc/init.d/atd %config /etc/init.d/atd
%config %attr(644,root,root) /etc/pam.d/atd %config %attr(644,root,root) /etc/pam.d/atd
@ -182,6 +179,7 @@ fi
/var/adm/fillup-templates/sysconfig.atd /var/adm/fillup-templates/sysconfig.atd
%if 0%{?has_systemd} %if 0%{?has_systemd}
%{_unitdir}/atd.service %{_unitdir}/atd.service
%{_prefix}/lib/systemd/system-sleep/atd.sh
%endif %endif
%changelog %changelog