OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/acpid?expand=0&rev=10

acpid.spec

@@ -13,7 +13,7 @@
 Name:           acpid
 URL:            http://acpid.sourceforge.net/
 Version:        1.0.6
-Release:        9
+Release:        12
 %define       acpi_version 0.09
 License:        GPL v2 or later
 Group:          System/Daemons
@@ -25,7 +25,7 @@ Patch:          %{name}-%{version}.dif
 Source1:        acpi-%{acpi_version}.tar.bz2
 Source2:        rcacpid
 Source3:        README.SuSE
-Source4:        ibm_acpi.modprobe
+Source4:        thinkpad_acpi.modprobe
 Source5:        events.default
 Patch1:         acpi_%{acpi_version}.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -66,7 +66,7 @@ popd
 %install
 make install INSTPREFIX=%{buildroot} SBINDIR=%{buildroot}/sbin
 install -Dm 744 rcacpid %{buildroot}/etc/init.d/acpid
-install -Dm 644 ibm_acpi.modprobe %{buildroot}/etc/modprobe.d/ibm_acpi
+install -Dm 644 thinkpad_acpi.modprobe %{buildroot}/etc/modprobe.d/thinkpad_acpi
 mkdir -p %{buildroot}/usr/sbin
 ln -sf ../../etc/init.d/acpid %{buildroot}/usr/sbin/rcacpid
 install -Dm 644 events.default %{buildroot}/etc/acpi/events/default
@@ -77,7 +77,6 @@ install -Dm 644 acpi.1 %{buildroot}/%{_mandir}/man1/acpi.1
 popd
 # for the rpmlint fascists
 mv samples examples 
-mkdir -p %{buildroot}/var/lib/acpi
 # keep the logfile
 install -dm 755 %buildroot%_var/log
 touch %buildroot%_var/log/acpid
@@ -87,7 +86,6 @@ rm -rf %{buildroot}
 
 %post
 %{fillup_and_insserv -Y -f acpid}
-rm -f -- var/lib/acpi/*
 
 %postun
 %restart_on_update acpid
@@ -103,7 +101,7 @@ rm -f -- var/lib/acpi/*
 %dir /etc/acpi/events
 /etc/acpi/events/default
 /etc/init.d/acpid
-/etc/modprobe.d/ibm_acpi
+/etc/modprobe.d/thinkpad_acpi
 /usr/sbin/rcacpid
 /sbin/acpid
 /usr/bin/acpi_listen
@@ -113,9 +111,13 @@ rm -f -- var/lib/acpi/*
 /usr/bin/acpi
 /usr/share/man/man1/acpi.1.gz
 %ghost %config(noreplace,missingok) %_var/log/acpid
-%dir %attr(0750, root, root) /var/lib/acpi
 
 %changelog
+* Wed Aug 08 2007 - thoenig@suse.de
+- remove loading of ACPI modules, they are now being loaded
+  automatically (#216564)
+- rename ibm_acpi.modprobe to thinkpad_acpi.modprobe as the kernel
+  module was renamed (#297812)
 * Mon Jul 30 2007 - seife@suse.de
 - fix "--skip-unsupported" warnings on module load (b.n.c #293758)
 * Tue Jul 03 2007 - seife@suse.de