Accepting request 182205 from home:seife:testing

remove power and sleep button handlers -- now handled by systemd, keep them as examples in the documentation

remove obsolete thinkpad_acpi modprobe config (bnc#792172)

OBS-URL: https://build.opensuse.org/request/show/182205
OBS-URL: https://build.opensuse.org/package/show/Base:System/acpid?expand=0&rev=60

acpid.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jul  4 12:41:12 UTC 2013 - seife+obs@b1-systems.com
+
+- remove power and sleep button handlers -- now handled by systemd
+  just keep them as examples in the documentation
+
+-------------------------------------------------------------------
+Wed Jul  3 19:36:13 UTC 2013 - seife+obs@b1-systems.com
+
+- remove obsolete thinkpad_acpi modprobe config (bnc#792172)
+
 -------------------------------------------------------------------
 Tue Jun  4 02:21:33 UTC 2013 - crrodriguez@opensuse.org
 

acpid.spec

@@ -26,7 +26,6 @@ Url:            http://tedfelix.com/linux/acpid-netlink.html
 Source:         http://tedfelix.com/linux/%{name}-%{version}.tar.xz
 Source2:        rcacpid
 Source3:        README.SuSE
-Source4:        thinkpad_acpi.modprobe
 Source5:        events.power_button
 Source6:        thinkpad_handler
 Source7:        power_button
@@ -57,7 +56,7 @@ Configure it in /etc/sysconfig/powermanagement.
 %setup -q
 %patch1
 
-cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE9} %{SOURCE10} %{SOURCE11} .
+cp %{SOURCE2} %{SOURCE3} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE9} %{SOURCE10} %{SOURCE11} .
 
 %build
 export LDFLAGS="-Wl,-z,relro,-z,now"
@@ -67,18 +66,15 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=%{buildroot} SBINDIR=%{_sbindir}
 install -Dm 744 rcacpid %{buildroot}%{_initddir}/acpid
-install -Dm 644 thinkpad_acpi.modprobe %{buildroot}%{_sysconfdir}/modprobe.d/50-thinkpad_acpi.conf
 install -Dm 744 thinkpad_handler %{buildroot}%{_prefix}/lib/acpid/thinkpad_handler
-install -Dm 744 power_button %{buildroot}%{_prefix}/lib/acpid/power_button
-install -Dm 744 sleep_button %{buildroot}%{_prefix}/lib/acpid/sleep_button
 mkdir -p %{buildroot}%{_prefix}/sbin
 ln -sf ../../etc/init.d/acpid %{buildroot}%{_sbindir}/rcacpid
-install -Dm 644 events.power_button %{buildroot}%{_sysconfdir}/acpi/events/power_button
-install -Dm 644 events.sleep_button %{buildroot}%{_sysconfdir}/acpi/events/sleep_button
 install -Dm 644 events.thinkpad %{buildroot}%{_sysconfdir}/acpi/events/thinkpad
 mkdir -p %{buildroot}/%{_unitdir}
 install -m 644 %{SOURCE8} %{buildroot}/%{_unitdir}
 
+# formerly installed, but no longer useful with systemd. Keep as documentation.
+cp -p events.power_button events.sleep_button power_button sleep_button samples/
 # for the rpmlint fascists
 mv samples examples
 # keep the logfile
@@ -103,15 +99,11 @@ touch %{buildroot}%{_localstatedir}/log/acpid
 
 %files
 %defattr(-,root,root)
-%dir %{_sysconfdir}/modprobe.d
 %dir %{_sysconfdir}/acpi
 %dir %{_sysconfdir}/acpi/events
 %{_sysconfdir}/acpi/events/thinkpad
-%{_sysconfdir}/acpi/events/power_button
-%{_sysconfdir}/acpi/events/sleep_button
 %{_prefix}/lib/acpid
 %{_sysconfdir}/init.d/acpid
-%{_sysconfdir}/modprobe.d/50-thinkpad_acpi.conf
 %_unitdir/%{name}.service
 %{_sbindir}/rcacpid
 %{_sbindir}/acpid

thinkpad_acpi.modprobe

@@ -1,12 +0,0 @@
-#
-# IBM/Lenovo ThinkPad ACPI driver options
-#
-# A detailed description of the parameters for the ThinkPad ACPI driver can be found
-# in  /usr/src/linux/Documentation/laptops/thinkpad-acpi.txt which is part of the package
-# 'kernel-source'.
-#
-# If you encounter problems with the hotkey mask please file a bug on
-# http://bugzilla.novell.com/
-#
-
-options thinkpad_acpi experimental=1 hotkey=0xffffff