rpms/gphoto2/devel gphoto2.spec,1.47,1.48

[fedora-cvs-commits at redhat.com]

Author: rvokal

Update of /cvs/dist/rpms/gphoto2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10060

Modified Files:
	gphoto2.spec 
Log Message:
 - docs are back in -devel package


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gphoto2.spec	13 Jan 2006 11:47:14 -0000	1.47
+++ gphoto2.spec	13 Jan 2006 12:42:57 -0000	1.48
@@ -82,6 +82,7 @@
 	--mandir=%{_mandir} \
 	--libdir=%{_libdir} \
 	--with-drivers=all \
+	--enable-docs \
 	--with-doc-dir=%{_docdir}/%{name} \
 	--disable-static
 export tagname=CC
@@ -101,6 +102,7 @@
 %configure \
 	--mandir=%{_mandir} \
 	--libdir=%{_libdir} \
+	--enable-docs \
 	--with-doc-dir=%{_docdir}/%{name} 
 
 export tagname=CC
@@ -133,9 +135,12 @@
 
 install -m755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/gphoto-set-procperm
 
-cp -a %{buildroot}%{_docdir}/%{name} installed-doc
+mv -f %{buildroot}%{_docdir}/%{name} installed-doc
+mv -f %{buildroot}/%{name} installed-doc
+mv -f %{buildroot}/%{name}-port installed-doc
+mv -f %{buildroot}/canon installed-doc
 find installed-doc -name '*.sgml' | xargs -r rm
-rm -rf %{buildroot}%{_docdir}/%{name}
+
 rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
 rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a
 rm -rf %{buildroot}%{_libdir}/*.a
@@ -148,6 +153,7 @@
 cat libgphoto2*.lang >> %{name}.lang
 
 
+
 ####################################
 %clean
 rm -rf "${RPM_BUILD_ROOT}"
@@ -206,7 +212,8 @@
 %changelog
 * Fri Jan 13 2006 Radek Vokal <rvokal at redhat.com> 2.1.99-2
 - spec file clean-up
-- use ./print-usb-map instead 
+- use ./print-usb-map 
+- docs are back in -devel package
 
 * Thu Jan 05 2006 Radek Vokal <rvokal at redhat.com> 2.1.99-1
 - upgrade to 2.1.99 + dbus patch