SPECS: nut.spec - separate hal stuff to -hal package - moved libupsclient t...

[baggins]

Author: baggins                      Date: Tue Jun  3 14:45:12 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- separate hal stuff to -hal package
- moved libupsclient to common (IMO makes more sense than keeping it in client)

---- Files affected:
SPECS:
   nut.spec (1.142 -> 1.143) 

---- Diffs:

================================================================
Index: SPECS/nut.spec
diff -u SPECS/nut.spec:1.142 SPECS/nut.spec:1.143
--- SPECS/nut.spec:1.142	Tue Jun  3 16:37:47 2008
+++ SPECS/nut.spec	Tue Jun  3 16:45:07 2008
@@ -161,7 +161,7 @@
 Summary(pl.UTF-8):	Pliki do tworzenia klientów NUT-a
 Group:		Development/Libraries
 Requires:	openssl-devel >= 0.9.7c
-# it does NOT require nut
+Requires:	%{name}-common = %{version}-%{release}
 
 %description devel
 Object file and header for developing NUT clients.
@@ -169,6 +169,18 @@
 %description devel -l pl.UTF-8
 Plik wynikowy oraz nagłówek służące do tworzenia klientów NUT-a.
 
+%package hal
+Summary:	NUT integration with FreeDesktop HAL
+Summary(pl.UTF-8):	Pliki do integracji NUT-a z HAL-em
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description hal
+NUT integration with FreeDesktop HAL.
+
+%description hal -l pl.UTF-8
+Pliki do integracji NUT-a z HAL-em.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -311,13 +323,6 @@
 %attr(755,root,root) /lib/nut/everups
 %attr(755,root,root) /lib/nut/gamatronic
 %attr(755,root,root) /lib/nut/genericups
-%if %{with hal}
-%attr(755,root,root) %{_libdir}/hal/hald-addon-bcmxcp_usb
-%attr(755,root,root) %{_libdir}/hal/hald-addon-megatec_usb
-%attr(755,root,root) %{_libdir}/hal/hald-addon-tripplite_usb
-%attr(755,root,root) %{_libdir}/hal/hald-addon-usbhid-ups
-%{_datadir}/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi
-%endif
 %attr(755,root,root) /lib/nut/isbmex
 %attr(755,root,root) /lib/nut/liebert
 %attr(755,root,root) /lib/nut/masterguard
@@ -391,11 +396,11 @@
 %defattr(644,root,root,755)
 %doc AUTHORS MAINTAINERS NEWS README UPGRADING ChangeLog docs
 %dir %{_sysconfdir}
+%ghost %{_libdir}/libupsclient.so.1
+%attr(755,root,root) %{_libdir}/libupsclient.so.*.*.*
 
 %files client
 %defattr(644,root,root,755)
-%ghost %{_libdir}/libupsclient.so.1
-%attr(755,root,root) %{_libdir}/libupsclient.so.*.*.*
 %attr(755,root,root) %{_bindir}/upsc
 %attr(755,root,root) %{_sbindir}/upsmon
 %attr(755,root,root) %{_sbindir}/upssched
@@ -426,6 +431,16 @@
 %{_mandir}/man8/upsstats.cgi.8*
 %endif
 
+%if %{with hal}
+%files hal
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/hal/hald-addon-bcmxcp_usb
+%attr(755,root,root) %{_libdir}/hal/hald-addon-megatec_usb
+%attr(755,root,root) %{_libdir}/hal/hald-addon-tripplite_usb
+%attr(755,root,root) %{_libdir}/hal/hald-addon-usbhid-ups
+%{_datadir}/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi
+%endif
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libupsclient.la
@@ -440,6 +455,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.143  2008-06-03 14:45:07  baggins
+- separate hal stuff to -hal package
+- moved libupsclient to common (IMO makes more sense than keeping it in client)
+
 Revision 1.142  2008-06-03 14:37:47  baggins
 - 2.2.2
 - fix linking with openssl
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nut.spec?r1=1.142&r2=1.143&f=u