rpms/apmd/devel apmd.spec,1.28,1.29

[Zdenek Prikryl (zprikryl)]

Author: zprikryl

Update of /cvs/extras/rpms/apmd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21565/devel

Modified Files:
	apmd.spec 
Log Message:
Merge Review


Index: apmd.spec
===================================================================
RCS file: /cvs/extras/rpms/apmd/devel/apmd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- apmd.spec	20 Feb 2008 08:47:52 -0000	1.28
+++ apmd.spec	28 May 2008 09:04:26 -0000	1.29
@@ -1,4 +1,4 @@
-Summary: Advanced Power Management (APM) BIOS utilities for laptops.
+Summary: Advanced Power Management (APM) BIOS utilities for laptops
 Name: apmd
 Version: 3.2.2
 Release: 7
@@ -11,11 +11,11 @@
 Patch1: apmd-3.2-umask.patch
 Patch2: apmd-3.2-error.patch
 Patch4: apmd-3.2-x.patch
+URL: ftp://ftp.debian.org/debian/pool/main/a/apmd
 Epoch: 1
-License: GPL
+License: GPLv2+
 Group: System Environment/Daemons
-Prereq: chkconfig
-Requires: pm-utils
+Requires: pm-utils chkconfig
 BuildRequires: libtool
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 ExclusiveArch: %{ix86}
@@ -57,10 +57,10 @@
 install -m 644 apmd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
 install -m 644 apmsleep.fr.1 $RPM_BUILD_ROOT/%{_mandir}/fr/man1/
 
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/apmd
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/apm-scripts/
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/apmd
-install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apm-scripts/
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/apmd
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/apm-scripts/
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/apmd
+install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/apm-scripts/
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/apmd_proxy
 rm -rf $RPM_BUILD_ROOT%{_bindir}/on_ac_power
 rm -rf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
@@ -95,7 +95,7 @@
 %config /etc/rc.d/init.d/apmd
 %config(noreplace) /etc/sysconfig/apmd
 %dir /etc/sysconfig/apm-scripts
-%config /etc/sysconfig/apm-scripts/*
+%config(noreplace) /etc/sysconfig/apm-scripts/*
 
 %changelog
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:3.2.2-7