SPECS: kima.spec - BR: hal-devel - added docs (merged from cpuinfo...

[arvenil]

Author: arvenil                      Date: Sun Sep 30 07:04:57 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: hal-devel
- added docs (merged from cpuinfo.spec)
- passed proper dirs to make for kde docs (merged from cpuinfo.spec)

---- Files affected:
SPECS:
   kima.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/kima.spec
diff -u SPECS/kima.spec:1.5 SPECS/kima.spec:1.6
--- SPECS/kima.spec:1.5	Sat Sep 29 23:40:24 2007
+++ SPECS/kima.spec	Sun Sep 30 09:04:51 2007
@@ -12,6 +12,7 @@
 URL:		http://kima.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	hal-devel
 BuildRequires:	kdelibs-devel
 Obsoletes:	cpuinfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,12 +43,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-# TODO: pass proper dirs to make install instead of moving
-install -D $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en/kima/index.cache.bz2 $RPM_BUILD_ROOT%{_kdedocdir}/en/kima/index.cache.bz2
-install -D $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en/kima/index.docbook $RPM_BUILD_ROOT%{_kdedocdir}/en/kima/index.docbook
-rm -f $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en/kima/index.cache.bz2 $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en/kima/index.docbook
+	DESTDIR=$RPM_BUILD_ROOT \
+	kde_htmldir=%{_kdedocdir}
 
 %find_lang %{name} --with-kde
 
@@ -55,6 +52,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
+%doc AUTHORS ChangeLog README TODO
 %defattr(644,root,root,755)
 %{_libdir}/kde3/libkima.la
 %attr(755,root,root) %{_libdir}/kde3/libkima.so
@@ -66,6 +64,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2007/09/30 07:04:51  arvenil
+- BR: hal-devel
+- added docs (merged from cpuinfo.spec)
+- passed proper dirs to make for kde docs (merged from cpuinfo.spec)
+
 Revision 1.5  2007/09/29 21:40:24  adamg
 - fixed URLs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kima.spec?r1=1.5&r2=1.6&f=u