SPECS: nut.spec - updated and aplied client.patch - _datadir packa...

[sls]

Author: sls                          Date: Wed Jul 25 17:09:32 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated and aplied client.patch
- _datadir packaged again
- TODO updates

---- Files affected:
SPECS:
   nut.spec (1.123 -> 1.124) 

---- Diffs:

================================================================
Index: SPECS/nut.spec
diff -u SPECS/nut.spec:1.123 SPECS/nut.spec:1.124
--- SPECS/nut.spec:1.123	Wed Jul 25 18:42:27 2007
+++ SPECS/nut.spec	Wed Jul 25 19:09:27 2007
@@ -1,8 +1,5 @@
 # $Revision$, $Date$
 # TODO:
-#	- upssched-cmd installed in /usr/bin, should be /sbin (Patch0, client/Makefile.am) 
-#	- _datadir files installed in /usr/share (Patch1, data/Makefile.am)
-#	- hidups bcond has wrong name and description (should be "usbups"? or removed)
 #	- unpackaged files:
 #		/usr/html/{{bottom,header,index}.html,nut-banner.png}
 #		/etc/udev/rules.d/52_nut-usbups.rules
@@ -165,7 +162,7 @@
 
 %prep
 %setup -q
-#patch0 -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -173,8 +170,10 @@
 %build
 cp -f /usr/share/automake/config.sub .
 %{__aclocal} -I m4
+%{__automake}
 %{__autoconf}
 %configure \
+	--datadir=%{_datadir}/%{name} \
 	--with-hal \
 	--with-serial \
 	--with-snmp \
@@ -330,7 +329,7 @@
 %attr(755,root,root) /lib/nut/upsdrvctl
 %attr(755,root,root) /lib/nut/usbhid-ups
 %attr(755,root,root) /lib/nut/victronups
-#{_datadir}/nut
+%{_datadir}/nut
 %{_mandir}/man8/al175.8*
 %{_mandir}/man8/apcsmart.8*
 %{_mandir}/man8/bcmxcp.8*
@@ -382,7 +381,7 @@
 %attr(755,root,root) %{_bindir}/upsc
 %attr(755,root,root) %{_sbindir}/upsmon
 %attr(755,root,root) %{_sbindir}/upssched
-#attr(755,root,root) %{_sbindir}/upssched-cmd
+%attr(755,root,root) %{_sbindir}/upssched-cmd
 %attr(754,root,root) /etc/rc.d/init.d/upsmon
 %attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/upsmon.conf
 %attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/upssched.conf
@@ -418,6 +417,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124  2007/07/25 17:09:27  sls
+- updated and aplied client.patch
+- _datadir packaged again
+- TODO updates
+
 Revision 1.123  2007/07/25 16:42:27  sls
 - client.patch comes back (NFY)
 - sorted drivers and driver manuals
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nut.spec?r1=1.123&r2=1.124&f=u