- rel 13; always restore systemd service

[packages/acpid.git] / acpid.spec

diff --git a/acpid.spec b/acpid.spec
index 1006910fb0eb0257a97245b5b177841aee9ad97a..79b79ebcc5c6c5e813c453ebf256541947cf0906 100644 (file)
--- a/acpid.spec
+++ b/acpid.spec
@@ -11,12 +11,12 @@
 Summary:       ACPI Event Daemon
 Summary(pl.UTF-8):     Demon zdarzeń ACPI
 Name:          acpid
-Version:       2.0.3
-Release:       1
+Version:       2.0.10
+Release:       13
 License:       GPL v2+
 Group:         Daemons
 Source0:       http://tedfelix.com/linux/%{name}-%{version}.tar.gz
-# Source0-md5: 6242a20d86cf0223db6fa0d58488e274
+# Source0-md5: d5dd88bcfaa4a0bf51905e95115da6df
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.logrotate
@@ -24,6 +24,9 @@ Source4:      %{name}.button.conf
 Source5:       %{name}.battery.conf
 Source6:       %{name}.button.sh
 Source7:       %{name}.battery.sh
+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
@@ -38,7 +41,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 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
@@ -75,24 +79,29 @@ wyłącznie jako dyspozytor wiadomości.
 %build
 %{__make} \
        CC="%{__cc}" \
-       LDFLAGS="%{rpmldflags}" \
-       OPT="%{rpmcflags}"
+       LDFLAGS="%{rpmcflags} %{rpmldflags}" \
+       OPT="%{rpmcppflags} %{rpmcflags} -Wno-error"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,rc.d/init.d,sysconfig},/var/log} \
-       $RPM_BUILD_ROOT%{_sysconfdir}/acpi/{events,actions}
+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 -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
-cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/battery
+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}
 
@@ -102,18 +111,32 @@ 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
-
-%triggerpostun -- %{name} < 1.0.4-4
-%banner -e %{name} << 'EOF'
-Default configuration files have changed.
-You might want to review your configuration in /etc/acpi
-EOF
+%systemd_preun acpid.service
+
+%postun
+%systemd_reload
+
+%triggerpostun -- %{name} < 2.0.10-12
+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)
@@ -126,9 +149,13 @@ EOF
 %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) %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)