- some fixes.

Changed files:
    apcupsd.spec -> 1.9

diff --git a/apcupsd.spec b/apcupsd.spec
index d5362d66e37ba729153e9b5b29608c3cd073d226..f93b1ed4a0963a7320276ff54dd6971d8d2db303 100644 (file)
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -12,6 +12,9 @@ URL:          http://www.brisse.dk/site/apcupsd/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 #Icon:         apcupsd-logo.xpm
 
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 #Icon:         apcupsd-logo.xpm
 

+%define        _prefix /
+%define _mandir        /usr/share/man
+

 %description
 UPS power management under Linux for APCC Products. It allows your
 computer/server to run during power problems for a specified length of time
 %description
 UPS power management under Linux for APCC Products. It allows your
 computer/server to run during power problems for a specified length of time


@@ -40,13 +43,16 @@ rm -rf ${RPM_BUILD_ROOT}
 # - why doesn't the Makefile know that it should install *-linux ??
 # - make install tries to stop apcupsd. That's not necessary (buildroot) (hany: not issue anymore)
 
 # - why doesn't the Makefile know that it should install *-linux ??
 # - make install tries to stop apcupsd. That's not necessary (buildroot) (hany: not issue anymore)
 

-install -d ${RPM_BUILD_ROOT}/{sbin,bin,etc/rc.d/init.d,usr/man/man8,var/log}
-NAME="-linux" make install
+#install -d ${RPM_BUILD_ROOT}/{sbin,bin,etc/rc.d/init.d,usr/man/man8,var/log}
+install -d ${RPM_BUILD_ROOT}/{bin,sbin,usr/share/man/man8}
+install -d ${RPM_BUILD_ROOT}/{etc/rc.d/init.d,var/log}
+
+NAME="-linux"  make MANPREFIX="${RPM_BUILD_ROOT}/usr/share/" install

 # hany: why this? we're just building. not installing
 #[ -x /sbin/powersc ] && /sbin/powersc RESTARTME
 # hany: why this? we're just building. not installing
 #[ -x /sbin/powersc ] && /sbin/powersc RESTARTME

-gzip -9nf \b ${RPM_BUILD_ROOT}/usr/man/*/*.?
-cp -f installs/apcupsd.conf ${RPM_BUILD_ROOT}/etc
-cp -f installs/apcups.rhs ${RPM_BUILD_ROOT}/etc/rc.d/init.d/apcups
+gzip -9nf ${RPM_BUILD_ROOT}/usr/share/man/man8/*
+install installs/apcupsd.conf ${RPM_BUILD_ROOT}/etc
+install installs/apcups.rhs ${RPM_BUILD_ROOT}/etc/rc.d/init.d/apcups

 touch ${RPM_BUILD_ROOT}/var/log/apcupsd.log
 touch ${RPM_BUILD_ROOT}/etc/apcupsd.status
 
 touch ${RPM_BUILD_ROOT}/var/log/apcupsd.log
 touch ${RPM_BUILD_ROOT}/etc/apcupsd.status
 


@@ -80,12 +86,12 @@ chkconfig --del apcups
 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%attr(-, root, root) %doc README.NEW Changelog port.gif Statement.APCC
-%attr(-, root, root) %doc %{name}-%{version}.src.lsm
-%attr(-, root, root) %doc readmes/*
-%attr(-, root, root) %doc docs/apcupsd.docs
-%attr(-, root, root) %doc installs/halt.rhs installs/apcups.rhs installs/powersc
-/usr/man/man8/apcupsd.8.gz
+%doc README.NEW Changelog port.gif Statement.APCC
+%doc %{name}-%{version}.src.lsm
+%doc readmes/*
+%doc docs/apcupsd.docs
+%doc installs/halt.rhs installs/apcups.rhs installs/powersc
+%attr(644,root,root) /usr/share/man/man8/apcupsd.8.gz

 %attr(755, root, bin)  /sbin/apcupsd
 %attr(755, root, root) /bin/apcaccess
 %attr(755, root, bin)  %config /sbin/powersc
 %attr(755, root, bin)  /sbin/apcupsd
 %attr(755, root, root) /bin/apcaccess
 %attr(755, root, bin)  %config /sbin/powersc