SPECS: elektra.spec - fix %instal re-entrancy

[glen]

Author: glen                         Date: Thu Mar  2 10:43:00 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix %instal re-entrancy

---- Files affected:
SPECS:
   elektra.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/elektra.spec
diff -u SPECS/elektra.spec:1.14 SPECS/elektra.spec:1.15
--- SPECS/elektra.spec:1.14	Tue Jul  5 22:29:10 2005
+++ SPECS/elektra.spec	Thu Mar  2 11:42:55 2006
@@ -13,6 +13,7 @@
 Patch1:		%{name}-libdir.patch
 Patch2:		%{name}-not_implemented_func_hack.patch
 Patch3:		%{name}-elektraenv.patch
+Patch4:		%{name}-doc.patch
 URL:		http://elektra.sourceforge.net/
 BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-progs
@@ -105,6 +106,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__make} all \
@@ -119,7 +121,9 @@
 	 LIB=/%{_lib} \
 	 DESTDIR=$RPM_BUILD_ROOT
 
-cp -a $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel elektra-api
+rm -rf elektra-api
+cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-devel elektra-api
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}{,-devel}
 
 echo 'RUN="no"' > $RPM_BUILD_ROOT/etc/sysconfig/elektra
 
@@ -145,7 +149,7 @@
 
 %files devel
 %defattr(644,root,root,755)
-%doc bindings elektra-api
+%doc bindings elektra-api/*
 %{_includedir}/*
 %{_mandir}/man3/*
 
@@ -159,6 +163,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/03/02 10:42:55  glen
+- fix %instal re-entrancy
+
 Revision 1.14  2005/07/05 20:29:10  darekr
 - unify sourceforge url
 
@@ -185,7 +192,7 @@
 Revision 1.9  2004/11/09 17:43:51  adamg
 - pl summaries/description
 - fixed group of -static package
-- missing defattr() in %%files section of -static package
+- missing defattr() in %files section of -static package
 - cosmetics
 
 Revision 1.8  2004/11/09 17:29:03  twittner
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/elektra.spec?r1=1.14&r2=1.15&f=u