- massive changes:

  * changed source ftp site and upgraded to 3.0beta9
  * pl description and group added
  * install section doesn't rely on makefile anymore
  * apmd-buildroot.patch removed
  * old non-PLD changelog truncated
  * FHS 2.0 compliant
  * 'xbattery' included
  * small 'apmd.init' PLD-fixes

Changed files:
    apmd.spec -> 1.2

diff --git a/apmd.spec b/apmd.spec
index 4517efa7194ffce041e61b9416a84187d87f5520..82d2e06cbe74295955f4636e9530056c77163955 100644 (file)
--- a/apmd.spec
+++ b/apmd.spec
@@ -1,44 +1,71 @@
-Summary: Advanced Power Management (APM) BIOS utilities for laptops.
-Name: apmd
-Version: 3.0beta5
-Release: 7
-Source: ftp://ftp.debian.org/debian/dists/frozen/main/source/admin/%{name}_%{version}-1.tar.gz
-Source1: apmd.init
-Patch1: apmd-buildroot.patch
-Copyright: GPL
-Group: System Environment/Daemons
-Requires: chkconfig >= 0.9
-Prereq: chkconfig
-BuildRoot: /var/tmp/apmd-root
-ExclusiveArch: i386
+Summary:       Advanced Power Management (APM) utilities for notebooks.
+Summary(pl):   Obs³uga zarz±dzania enerig± (APM) dla notebooków.
+Name:          apmd
+Version:       3.0beta9
+Release:       1
+Copyright:     GPL
+Group:                 Utilities/System
+Group(pl):     Narzêdzia/system
+URL:           http://www.worldvisions.ca/~apenwarr/apmd
+Source:                http://worldvisions.ca/~apenwarr/apmd/%{name}-%{version}.tar.gz
+Source1:       apmd.init
+Requires:      procps
+Prereq:                chkconfig
+BuildRoot:     /tmp/%{name}-%{version}
+ExclusiveArch:  i386 i486 i586 i686
 
 %description
-This is a Advanced Power Management daemon and utilities.
-It can watch your notebook's battery and warn all users when the battery
-is low.
+Advanced Power Management daemon and utilities allows you to watch your 
+notebook's power state and warn all users when the battery is low. It can
+also handle some power state events automatically.
 
-Patches to Rik Faith's original version have been added for shutting down
-the PCMCIA sockets before a suspend.
+%description -l pl
+Demon zadz±dzania energi± APM (Advanced Power Management) wraz z programami
+pomocniczymi. Dziêki nim mo¿liwe jest monitorowanie stanu zasilania Twojego
+notebooka i ostrzeganie wszystkich u¿ytkowników o koñcz±cej siê baterii, jak
+równie¿ automatyczne reagowanie na zmiany.
 
 %prep
 %setup -q -n apmd
-%patch1 -p1 -b .buildroot
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s
+make -C xbattery clean
+make CCOPTIONS="$RPM_OPT_FLAGS" -C xbattery
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,include,lib,sbin,man/man1,man/man8,X11R6/bin,X11R6/man/man1}
-make RPM_BUILD_ROOT=$RPM_BUILD_ROOT install
+mkdir -p $RPM_BUILD_ROOT/usr/{bin,include,lib,sbin}
+mkdir -p $RPM_BUILD_ROOT/usr/X11R6/{bin,man/man1}
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/{man1,man8}
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
-install -m 755 $RPM_SOURCE_DIR/apmd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/apmd
+install apm    $RPM_BUILD_ROOT/usr/bin
+install apmd   $RPM_BUILD_ROOT/usr/sbin
+install apmsleep $RPM_BUILD_ROOT/usr/bin
+install tailf  $RPM_BUILD_ROOT/usr/bin
+install on_ac_power $RPM_BUILD_ROOT/usr/bin
+install xapm   $RPM_BUILD_ROOT/usr/X11R6/bin
+install apmd_proxy $RPM_BUILD_ROOT/usr/sbin
+install apm.1  $RPM_BUILD_ROOT/usr/share/man/man1/
+install apmd.8         $RPM_BUILD_ROOT/usr/share/man/man8/
+install xapm.1         $RPM_BUILD_ROOT/usr/X11R6/man/man1/xapm.1x
+install tailf.1  $RPM_BUILD_ROOT/usr/share/man/man1/
+install apmsleep.1 $RPM_BUILD_ROOT/usr/share/man/man1
+install libapm.a $RPM_BUILD_ROOT/usr/lib
+install apm.h $RPM_BUILD_ROOT/usr/include
+install $RPM_SOURCE_DIR/apmd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/apmd
+install -s xbattery/xbattery $RPM_BUILD_ROOT/usr/X11R6/bin
+install xbattery/xbattery.man $RPM_BUILD_ROOT/usr/X11R6/man/man1/xbattery.1x
 
 cat <<'EOF' >$RPM_BUILD_ROOT/etc/sysconfig/apmd
 APMD_OPTIONS="-p 10 -w 5 -W"
 EOF
 
+gzip -9nf $RPM_BUILD_ROOT/usr/share/man/man*/* \
+       $RPM_BUILD_ROOT/usr/X11R6/man/man*/* \
+       README README.transfer ChangeLog ANNOUNCE
+ 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -46,19 +73,19 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/chkconfig --add apmd
 
 %preun
-if [ $1 = 0 ]; then
+if [ "$1" = "0" ]; then
        /sbin/chkconfig --del apmd
 fi
 
 %files
-%doc ANNOUNCE ChangeLog README README.transfer LSM
-/usr/man/man1/*
-/usr/man/man8/*
-#/usr/X11R6/bin/*
-#/usr/X11R6/man/man1/*
-/usr/bin/*
-/usr/sbin/*
+%defattr(644,root,root,755)
+%doc ANNOUNCE.gz ChangeLog.gz README.gz README.transfer.gz
+/usr/share/man/man*/*
+/usr/X11R6/man/man*/*
+%attr(755,root,root) /usr/X11R6/bin/*
+%attr(755,root,root) /usr/bin/*
+%attr(755,root,root) /usr/sbin/*
 /usr/include/*
 /usr/lib/*
-%config /etc/rc.d/init.d/apmd
+%attr(755,root,root) %config /etc/rc.d/init.d/apmd
 %config /etc/sysconfig/apmd