diff --git a/.cvsignore b/.cvsignore index 4b97504..a1c78f9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -acpid-1.0.2.tar.gz +acpid-1.0.3.tar.gz diff --git a/acpid-1.0.3-conf.patch b/acpid-1.0.3-conf.patch new file mode 100644 index 0000000..cda175a --- /dev/null +++ b/acpid-1.0.3-conf.patch @@ -0,0 +1,10 @@ +diff -urN acpid/samples/sample.conf acpid-1.0.3/samples/sample.conf +--- acpid/samples/sample.conf 2001-08-16 23:50:27.000000000 +0200 ++++ acpid-1.0.3/samples/sample.conf 2004-08-09 01:15:09.879605992 +0200 +@@ -1,4 +1,4 @@ + # This is a sample ACPID configuration + +-# event=button power.* +-# action=/usr/local/bin/power.sh "%e" ++event=button/power.* ++action=/sbin/shutdown -h now diff --git a/acpid-1.0.3-makefile.patch b/acpid-1.0.3-makefile.patch new file mode 100644 index 0000000..969770f --- /dev/null +++ b/acpid-1.0.3-makefile.patch @@ -0,0 +1,20 @@ +diff -u acpid-1.0.3/Makefile acpid-1.0.3/Makefile +--- acpid-1.0.3/Makefile 2004-08-09 01:27:12.415763800 +0200 ++++ acpid-1.0.3/Makefile 2004-08-09 01:29:42.110006816 +0200 +@@ -21,7 +21,7 @@ + MAN8 = acpid.8 acpi_listen.8 + MAN8GZ = $(MAN8:.8=.8.gz) + +-CFLAGS = -Wall -Werror -g $(DEFS) ++CFLAGS = -Wall -Werror -g $(DEFS) $(RPM_OPT_FLAGS) + DEFS = -DVERSION="\"$(VERSION)\"" + + all: $(PROGS) +@@ -36,6 +36,7 @@ + install: $(PROGS) man + mkdir -p $(SBINDIR) + install -m 750 acpid $(SBINDIR) ++ mkdir -p $(BINDIR) + install -m 755 acpi_listen $(BINDIR) + mkdir -p $(MAN8DIR) + install -m 644 $(MAN8GZ) $(MAN8DIR) diff --git a/acpid.logrotate b/acpid.logrotate new file mode 100644 index 0000000..9408f72 --- /dev/null +++ b/acpid.logrotate @@ -0,0 +1,8 @@ +/var/log/acpid { + missingok + notifempty + size=64k + postrotate + /etc/init.d/acpid condrestart >/dev/null || : + endscript +} diff --git a/acpid.spec b/acpid.spec index aa1fb05..cb13bc0 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,13 +1,15 @@ Summary: ACPI Event Daemon Name: acpid -Version: 1.0.2 -Release: 7 -Copyright: GPL +Version: 1.0.3 +Release: 2 +License: GPL Group: System Environment/Daemons Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz +Source1: acpid.logrotate Source2: acpid.init -Patch: acpid-1.0.1-pm1.diff -Patch2: acpid-1.0.1-conf.patch +Patch0: acpid-1.0.3-pm1.patch +Patch1: acpid-1.0.3-conf.patch +Patch2: acpid-1.0.3-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root ExclusiveArch: ia64 x86_64 %{ix86} URL: http://acpid.sourceforge.net/ @@ -20,7 +22,8 @@ acpid is a daemon that dispatches ACPI events to user-space programs. %prep %setup -%patch -p1 +%patch0 -p1 +%patch1 -p1 %patch2 -p1 %build @@ -41,9 +44,11 @@ mkdir -p $RPM_BUILD_ROOT/var/log touch $RPM_BUILD_ROOT/var/log/acpid chmod 640 $RPM_BUILD_ROOT/var/log/acpid +mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/acpid + mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/acpid -chmod 755 $RPM_BUILD_ROOT/etc/rc.d/init.d/acpid %clean @@ -56,10 +61,13 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/acpi/events %dir /etc/acpi/actions %config %attr(0644,root,root) /etc/acpi/events/sample.conf -/var/log/acpid +%config /etc/logrotate.d/acpid +%verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/acpid +/usr/bin/acpi_listen /usr/sbin/acpid %attr(0755,root,root) /etc/rc.d/init.d/acpid /usr/share/man/man8/acpid.8.gz +/usr/share/man/man8/acpi_listen.8.gz %post @@ -67,11 +75,25 @@ rm -rf $RPM_BUILD_ROOT %preun if [ "$1" = "0" ]; then - service acpid stop >/dev/null 2>&1 + /sbin/service acpid stop >/dev/null 2>&1 /sbin/chkconfig --del acpid fi +%postun +if [ "$1" -ge "1" ]; then + /sbin/service acpid condrestart >/dev/null 2>&1 +fi + %changelog +* Mon Aug 9 2004 Miloslav Trmac - 1.0.3-2 +- Update to 1.0.3 (fixes #128834) +- s/Copyright/License/ +- Add logrotate config file (#110677, from Michal Jaegermann) +- Don't verify contents of /var/log/acpid (#125862) +- Use $RPM_OPT_FLAGS +- Fix and cleanup acpid-1.0.1-pm1.patch +- Add condrestart to %%postun + * Tue Jun 15 2004 Elliot Lee - rebuilt diff --git a/sources b/sources index 33866fa..86acb31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -15884aaf0b82717954f9366b5c00808b acpid-1.0.2.tar.gz +8513c19d0f14ff396ea73caaea7f2ef8 acpid-1.0.3.tar.gz