- updated to 3.0,

- spec adapterized,
- standarized %post and %postun,
- added Epoch: 1 for allow upgrade from beta version,
TODO:
- new script suit (look at latest apmd from MDK as template),
- rewite %build and %install.

Changed files:
    apmd.spec -> 1.7

diff --git a/apmd.spec b/apmd.spec
index 73510d2021280a5e30513d8d543dd83958e1e667..3188fdd89c21d126bcec82781cf0ad7ea5798e0f 100644 (file)
--- a/apmd.spec
+++ b/apmd.spec
@@ -1,70 +1,71 @@
 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
+Name:          apmd
+Version:       3.0
+Release:       1
+Epoch:         1
+License:       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
+Source:                http://www.worldvisions.ca/~apenwarr/apmd/%{name}-%{version}.tar.gz
+Source1:       apmd.init
+URL:           http://www.worldvisions.ca/~apenwarr/apmd/
 Requires:      procps
 Prereq:                chkconfig
 BuildRequires: XFree86-devel
-BuildRoot:     /tmp/%{name}-%{version}
-ExclusiveArch:  %{ix86}
+BuildRoot:     /tmp/%{name}-%{version}-root
+ExclusiveArch: %{ix86}
 
 %description
-Advanced Power Management daemon and utilities allows you to watch your 
+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.
 
 %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.
+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
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s APMD_PROXY_DIR=/usr/sbin
+make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s APMD_PROXY_DIR=%{_sbindir}
 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}
-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 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
+install -d $RPM_BUILD_ROOT%{_prefix}/{bin,include,lib,sbin}
+install -d $RPM_BUILD_ROOT%{_prefix}/X11R6/{bin,man/man1}
+install -d $RPM_BUILD_ROOT%{_datadir}/man/{man1,man8}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install apm    $RPM_BUILD_ROOT%{_bindir}
+install apmd   $RPM_BUILD_ROOT%{_sbindir}
+install apmsleep $RPM_BUILD_ROOT%{_bindir}
+install tailf  $RPM_BUILD_ROOT%{_bindir}
+install on_ac_power $RPM_BUILD_ROOT%{_bindir}
+install xapm   $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
+install apmd_proxy $RPM_BUILD_ROOT%{_sbindir}
+install apm.1  $RPM_BUILD_ROOT%{_datadir}/man/man1/
+install apmd.8         $RPM_BUILD_ROOT%{_datadir}/man/man8/
+install xapm.1         $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1/xapm.1x
+install tailf.1  $RPM_BUILD_ROOT%{_datadir}/man/man1/
+install apmsleep.1 $RPM_BUILD_ROOT%{_datadir}/man/man1
+install libapm.a $RPM_BUILD_ROOT%{_libdir}
+install apm.h $RPM_BUILD_ROOT%{_includedir}
+install $RPM_SOURCE_DIR/apmd.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/apmd
+install -s xbattery/xbattery $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
+install xbattery/xbattery.man $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1/xbattery.1x
 
-cat <<'EOF' >$RPM_BUILD_ROOT/etc/sysconfig/apmd
-APMD_OPTIONS="-p 10 -w 5 -W -P /usr/sbin/apmd_proxy"
+cat <<'EOF' >$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/apmd
+APMD_OPTIONS="-p 10 -w 5 -W -P %{_sbindir}/apmd_proxy"
 EOF
 
-gzip -9nf $RPM_BUILD_ROOT/usr/share/man/man*/* \
-       $RPM_BUILD_ROOT/usr/X11R6/man/man*/* \
+gzip -9nf $RPM_BUILD_ROOT%{_datadir}/man/man*/* \
+       $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man*/* \
        README README.transfer ChangeLog ANNOUNCE
  
 %clean
@@ -72,21 +73,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add apmd
+if [ -f /var/lock/subsys/apmd ]; then
+       %{_sysconfdir}/rc.d/init.d/apmd restart 1>&2
+else
+       echo "Run \"/etc/rc.d/init.d/apmd start\" to start apmd daemon."
+fi
 
 %preun
 if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/apmd ]; then
+               /etc/rc.d/init.d/apmd stop 1>&2
+       fi
        /sbin/chkconfig --del apmd
 fi
 
 %files
 %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/*
-%attr(754,root,root) /etc/rc.d/init.d/apmd
-%config /etc/sysconfig/apmd
+%{_datadir}/man/man*/*
+%{_prefix}/X11R6/man/man*/*
+%attr(755,root,root) %{_prefix}/X11R6/bin/*
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_sbindir}/*
+%{_includedir}/*
+%{_libdir}/*
+%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/apmd
+%config %{_sysconfdir}/sysconfig/apmd