Accepting request 49672 from Base:System

checked in (request 49672)

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

acpid.spec

@@ -19,15 +19,17 @@
 
 
 Name:           acpid
-Url:            http://tedfelix.com/linux/acpid-netlink.html
-Version:        2.0.6
+Url:            http://acpid.sourceforge.net/
+Version:        1.0.10
 Release:        3
+%define       acpi_version 0.09
 License:        GPL v2 or later
 Group:          System/Daemons
 AutoReqProv:    on
 PreReq:         %insserv_prereq %fillup_prereq
 Summary:        Executes Actions at ACPI Events
 Source:         %{name}-%{version}.tar.gz
+Source1:        acpi-%{acpi_version}.tar.bz2
 Source2:        rcacpid
 Source3:        README.SuSE
 Source4:        thinkpad_acpi.modprobe
@@ -35,9 +37,7 @@ Source5:        events.power_button
 Source9:        events.thinkpad
 Source6:        thinkpad_handler
 Source7:        power_button
-Source8:        acpid.service
-Patch1:         acpid-makefile.patch
-Patch2:         acpid-2.0.5-forking.patch
+Patch1:         acpi_%{acpi_version}.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 x86_64 ia64
 
@@ -56,19 +56,23 @@ Authors:
     Andrew Grover <andrew.grover@intel.com>
     Tim Hockin <thockin@sun.com>
     Cajus Pollmeier <pollmeier@gonicus.de>
-    Ted Felix <ted@tedfelix.com>
 
 %prep
-%setup -q
-%patch1 -p0
-%patch2 -p1
+%setup -b 0 -a 1
+%patch1
+pushd acpi-%{acpi_version}
+popd
 cp %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:9} .
 
 %build
-make OPT="$RPM_OPT_FLAGS" %{?_smp_mflags}
+pushd acpi-%{acpi_version}
+ln -sf /usr/share/automake*/install-sh install-sh
+./configure
+make CFLAGS="$RPM_OPT_FLAGS"
+popd
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT SBINDIR=/sbin
+make install INSTPREFIX=%{buildroot} SBINDIR=%{buildroot}/sbin
 install -Dm 744 rcacpid %{buildroot}/etc/init.d/acpid
 install -Dm 644 thinkpad_acpi.modprobe %{buildroot}/etc/modprobe.d/50-thinkpad_acpi.conf
 install -Dm 744 thinkpad_handler %{buildroot}/usr/lib/acpid/thinkpad_handler
@@ -77,9 +81,11 @@ mkdir -p %{buildroot}/usr/sbin
 ln -sf ../../etc/init.d/acpid %{buildroot}/usr/sbin/rcacpid
 install -Dm 644 events.power_button %{buildroot}/etc/acpi/events/power_button
 install -Dm 644 events.thinkpad %{buildroot}/etc/acpi/events/thinkpad
-mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
-install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/lib/systemd/system
-
+pushd acpi-%{acpi_version}
+ln -sf /usr/share/automake*/mkinstalldirs mkinstalldirs
+make prefix=%{buildroot}/usr install
+install -Dm 644 acpi.1 %{buildroot}/%{_mandir}/man1/acpi.1
+popd
 # for the rpmlint fascists
 mv samples examples 
 # keep the logfile
@@ -109,13 +115,14 @@ rm -rf %{buildroot}
 /usr/lib/acpid
 /etc/init.d/acpid
 /etc/modprobe.d/50-thinkpad_acpi.conf
-/lib/systemd/system/%{name}.service
 /usr/sbin/rcacpid
 /sbin/acpid
 /usr/bin/acpi_listen
 %doc README.SuSE README Changelog examples
 /usr/share/man/man8/acpid.8.gz
 /usr/share/man/man8/acpi_listen.8.gz
+/usr/bin/acpi
+/usr/share/man/man1/acpi.1.gz
 %ghost %config(noreplace,missingok) %_var/log/acpid
 
 %changelog