packages: qt4/qt4.spec - qdoc3 is back

[charles]

Author: charles                      Date: Fri Dec  4 04:17:51 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- qdoc3 is back

---- Files affected:
packages/qt4:
   qt4.spec (1.229 -> 1.230) 

---- Diffs:

================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.229 packages/qt4/qt4.spec:1.230
--- packages/qt4/qt4.spec:1.229	Fri Dec  4 04:05:29 2009
+++ packages/qt4/qt4.spec	Fri Dec  4 05:17:44 2009
@@ -1502,14 +1502,14 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir},%{_pkgconfigdir},%{_libdir}/qt4/tools/qdoc3}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir},%{_pkgconfigdir}}
 install -d $RPM_BUILD_ROOT%{_qtdir}/plugins/{crypto,network}
 
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # for qt-creator sth is messed up in the Makefile, nothing for make install
-#install tools/qdoc3/qdoc3 $RPM_BUILD_ROOT%{_libdir}/qt4/tools/qdoc3
+install bin/qdoc3 $RPM_BUILD_ROOT%{_qtdir}/bin/qdoc3
 
 # kill -L/inside/builddir from *.la and *.pc (bug #77152)
 %{__sed} -i -e "s,-L$PWD/lib,,g" $RPM_BUILD_ROOT%{_libdir}/*.{la,prl}
@@ -1533,6 +1533,7 @@
 ln -sf ../%{_lib}/qt4/bin/qmake qmake-qt4
 ln -sf ../%{_lib}/qt4/bin/qtconfig qtconfig-qt4
 ln -sf ../%{_lib}/qt4/bin/uic uic-qt4
+ln -sf ../%{_lib}/qt4/bin/qdoc3 .
 ln -sf ../%{_lib}/qt4/bin/qt3to4 .
 ln -sf ../%{_lib}/qt4/bin/rcc .
 ln -sf ../%{_lib}/qt4/bin/uic3 .
@@ -1808,7 +1809,6 @@
 %dir %{_qtdir}/plugins/network
 %dir %{_qtdir}/plugins/sqldrivers
 %dir %{_qtdir}/plugins/script
-%dir %{_qtdir}/tools
 %dir %{_datadir}/qt4
 %lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/qt4.qm
 %lang(da) %{_datadir}/locale/da/LC_MESSAGES/qt4.qm
@@ -1998,19 +1998,19 @@
 
 %files build
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/rcc
 %attr(755,root,root) %{_bindir}/moc-qt4
+%attr(755,root,root) %{_bindir}/qdoc3
 %attr(755,root,root) %{_bindir}/qt3to4
+%attr(755,root,root) %{_bindir}/rcc
 %attr(755,root,root) %{_bindir}/uic-qt4
-%attr(755,root,root) %{_qtdir}/bin/rcc
 %attr(755,root,root) %{_qtdir}/bin/moc
+%attr(755,root,root) %{_qtdir}/bin/qdoc3
 %attr(755,root,root) %{_qtdir}/bin/qt3to4
+%attr(755,root,root) %{_qtdir}/bin/rcc
 %attr(755,root,root) %{_qtdir}/bin/uic
 #find better place?
 %attr(755,root,root) %{_bindir}/qttracereplay
 %attr(755,root,root) %{_qtdir}/bin/qttracereplay
-#%dir %{_libdir}/qt4/tools/qdoc3
-#%attr(755,root,root) %{_libdir}/qt4/tools/qdoc3/qdoc3
 %{_datadir}/qt4/q3porting.xml
 
 %files designer
@@ -2253,6 +2253,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.230  2009/12/04 04:17:44  charles
+- qdoc3 is back
+
 Revision 1.229  2009/12/04 03:05:29  charles
 - update files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.229&r2=1.230&f=u