packages: acpid/acpid.spec - use make install and pass cflags via $OPT

[glen]

Author: glen                         Date: Tue Mar 23 07:25:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use make install and pass cflags via $OPT

---- Files affected:
packages/acpid:
   acpid.spec (1.67 -> 1.68) 

---- Diffs:

================================================================
Index: packages/acpid/acpid.spec
diff -u packages/acpid/acpid.spec:1.67 packages/acpid/acpid.spec:1.68
--- packages/acpid/acpid.spec:1.67	Tue Mar 23 01:14:53 2010
+++ packages/acpid/acpid.spec	Tue Mar 23 08:24:58 2010
@@ -8,11 +8,12 @@
 #   also it does not allow *.conf files (missing "."), which is not backward
 #   compatible (custom files can be left unprocessed)
 #   but if patch is made to allow ".", must consider to ignore .rpm{new,old,save} files
+# - build and package kacpimon
 Summary:	ACPI Event Daemon
 Summary(pl.UTF-8):	Demon zdarzeń ACPI
 Name:		acpid
 Version:	2.0.3
-Release:	0.2
+Release:	0.3
 License:	GPL v2+
 Group:		Daemons
 Source0:	http://tedfelix.com/linux/%{name}-%{version}.tar.gz
@@ -76,16 +77,16 @@
 %{__make} \
 	CC="%{__cc}" \
 	LDFLAGS="%{rpmldflags}" \
-	CFLAGS='-Wall -Werror %{rpmcflags} -D_GNU_SOURCE $(DEFS)'
+	OPT="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{logrotate.d,rc.d/init.d,sysconfig},/var/log} \
-	$RPM_BUILD_ROOT{%{_sysconfdir}/acpi/{events,actions},%{_sbindir},%{_bindir},%{_mandir}/man8}
+install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,rc.d/init.d,sysconfig},/var/log} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/acpi/{events,actions}
+
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install -p acpid $RPM_BUILD_ROOT%{_sbindir}
-install -p acpi_listen $RPM_BUILD_ROOT%{_bindir}
-cp -a acpid.8 acpi_listen.8 $RPM_BUILD_ROOT%{_mandir}/man8
 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
@@ -94,6 +95,7 @@
 install -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/button.sh
 install -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/battery.sh
 > $RPM_BUILD_ROOT/var/log/acpid
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -116,7 +118,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc Changelog README TODO
+%doc Changelog README TODO TESTPLAN
 %attr(755,root,root) %{_sbindir}/acpid
 %attr(755,root,root) %{_bindir}/acpi_listen
 %dir %{_sysconfdir}/acpi
@@ -141,6 +143,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2010/03/23 07:24:58  glen
+- use make install and pass cflags via $OPT
+
 Revision 1.67  2010/03/23 00:14:53  glen
 - 2.0.3, new source
 - note: *.sh not recognized in /etc/acpi/events
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/acpid/acpid.spec?r1=1.67&r2=1.68&f=u