SPECS: qt4.spec - fixed qdbus* duplicates

[qboosh]

Author: qboosh                       Date: Sun Jun  3 08:40:37 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed qdbus* duplicates

---- Files affected:
SPECS:
   qt4.spec (1.131 -> 1.132) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.131 SPECS/qt4.spec:1.132
--- SPECS/qt4.spec:1.131	Fri Jun  1 16:08:42 2007
+++ SPECS/qt4.spec	Sun Jun  3 10:40:32 2007
@@ -1106,18 +1106,14 @@
 
 # kill -L/inside/builddir from *.la and *.pc (bug #77152)
 %{__sed} -i -e "s,-L$PWD/lib,,g" $RPM_BUILD_ROOT%{_libdir}/*.{la,prl}
-%{__sed} -i -e "s,-L$PWD/lib,,g" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc
+%{__sed} -i -e "s,-L$PWD/lib,,g" $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
 %{__sed} -i -e '
 	s|moc_location=.*|moc_location=%{_bindir}/qt4-moc|;
 	s|uic_location=.*|uic_location=%{_bindir}/qt4-uic|;
-	' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc
+	' $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
 
 # install tools
 install bin/findtr	$RPM_BUILD_ROOT%{_qtdir}/bin
-install bin/qdbus	$RPM_BUILD_ROOT%{_bindir}
-install bin/qdbuscpp2xml	$RPM_BUILD_ROOT%{_bindir}
-install bin/qdbusxml2cpp	$RPM_BUILD_ROOT%{_bindir}
-#mv $RPM_BUILD_ROOT%{_libdir}/qt4/bin/qvfb	$RPM_BUILD_ROOT%{_bindir}
 
 cd $RPM_BUILD_ROOT%{_bindir}
 ln -sf ../%{_lib}/qt4/bin/assistant qt4-assistant
@@ -1194,7 +1190,6 @@
 ln -s %{_docdir}/%{name}-doc $RPM_BUILD_ROOT%{_qtdir}/doc
 ln -s %{_datadir}/qt4/mkspecs $RPM_BUILD_ROOT%{_qtdir}/mkspecs
 
-#mv $RPM_BUILD_ROOT%{_libdir}/*.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 for f in $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc; do
 	HAVEDEBUG=`echo $f | grep _debug | wc -l`
 	MODULE=`echo $f | basename $f | cut -d. -f1 | cut -d_ -f1`
@@ -1248,7 +1243,7 @@
 }
 
 mkdevfl QtCore %{_includedir}/qt4 %{_includedir}/qt4/Qt
-mkdevfl QtDBus %{_bindir}/qdbus %{_bindir}/qdbuscpp2xml %{_bindir}/qdbusxml2cpp
+mkdevfl QtDBus %{_qtdir}/bin/qdbuscpp2xml %{_qtdir}/bin/qdbusxml2cpp %{_bindir}/qdbuscpp2xml %{_bindir}/qdbusxml2cpp
 mkdevfl QtGui
 mkdevfl QtNetwork
 mkdevfl QtOpenGL
@@ -1366,8 +1361,10 @@
 
 %files -n QtDBus
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_qtdir}/bin/qdbus*
-%attr(755,root,root) %{_bindir}/qdbus*
+%attr(755,root,root) %{_qtdir}/bin/qdbus
+%attr(755,root,root) %{_qtdir}/bin/qdbusviewer
+%attr(755,root,root) %{_bindir}/qdbus
+%attr(755,root,root) %{_bindir}/qdbusviewer
 %attr(755,root,root) %{_libdir}/libQtDBus.so.*.*
 
 %files -n QtGui
@@ -1612,6 +1609,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.132  2007/06/03 08:40:32  qboosh
+- fixed qdbus* duplicates
+
 Revision 1.131  2007/06/01 14:08:42  pascalek
 - Updated to 4.3.0
 - simplified file lists
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.131&r2=1.132&f=u