rpms/libp11/devel libp11.spec,1.14,1.15

[Kalev Lember]

Author: kalev

Update of /cvs/pkgs/rpms/libp11/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24919

Modified Files:
	libp11.spec 
Log Message:
Don't install html docs with main library package



Index: libp11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libp11/devel/libp11.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libp11.spec	4 Jul 2010 10:12:21 -0000	1.14
+++ libp11.spec	4 Jul 2010 10:16:46 -0000	1.15
@@ -29,20 +29,16 @@ Files for developing with %{name}
 %setup -q
 
 %build
-%configure --disable-static --enable-doc --enable-api-doc
+%configure --disable-static --enable-api-doc
 make %{?_smp_mflags}
 
-# Remove CRLF line endings
-sed -i "s|\r||g" doc/nonpersistent/wiki.out/trac.css
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # Use %%doc to install documentation in a standard location
 mkdir __docdir
-mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/{api,wiki}/ __docdir/
-mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/README __docdir/wiki
+mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/api/ __docdir/
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/
 
 %clean
@@ -54,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING NEWS __docdir/wiki
+%doc COPYING NEWS
 %{_libdir}/libp11.so.*
 
 %files devel
@@ -68,6 +64,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Sun Jul 04 2010 Kalev Lember <kalev at smartlink.ee> - 0.2.7-2
+- Don't install html docs with main library package
 - Removed R: pkgconfig from -devel as it is now automatically added
 
 * Wed Nov 25 2009 Kalev Lember <kalev at smartlink.ee> - 0.2.7-1