SPECS (DEVEL): qt4.spec - since 4.3.0 QtUiTools is just static, so...

[shadzik]

Author: shadzik                      Date: Thu May 31 00:15:07 2007 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- since 4.3.0 QtUiTools is just static, so remove QtUiTools subpackage
- P: and O: QtUiTools to QtUiTools-static

---- Files affected:
SPECS:
   qt4.spec (1.129.2.6 -> 1.129.2.7) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.129.2.6 SPECS/qt4.spec:1.129.2.7
--- SPECS/qt4.spec:1.129.2.6	Wed May 30 20:44:30 2007
+++ SPECS/qt4.spec	Thu May 31 02:15:02 2007
@@ -763,21 +763,6 @@
 Klasy pozwalajÄ
ce dodać obsługę skryptów w aplikacjach - biblioteka
 statyczna.
 
-%package -n QtUiTools
-Summary:	Classes for handling Qt Designer forms in applications
-Summary(pl.UTF-8):	Klasy do obsługi formularzy Qt Designera w aplikacjach
-Group:		X11/Libraries
-Requires:	QtGui = %{version}-%{release}
-Requires:	QtXml = %{version}-%{release}
-
-%description -n QtUiTools
-The QtUiTools module provides classes to handle forms created with Qt
-Designer.
-
-%description -n QtUiTools -l pl.UTF-8
-Moduł QtUiTools udostępnia klasy do obsługi formularzy tworzonych przy
-uĹźyciu Qt Designera.
-
 %package -n QtUiTools-devel
 Summary:	Classes for handling Qt Designer forms in applications - development files
 Summary(pl.UTF-8):	Klasy do obsługi formularzy Qt Designera w aplikacjach - pliki programistyczne
@@ -798,6 +783,8 @@
 Summary(pl.UTF-8):	Klasy do obsługi formularzy Qt Designera w aplikacjach - biblioteka statyczna
 Group:		X11/Development/Libraries
 Requires:	QtUiTools-devel = %{version}-%{release}
+Provides:	QtUiTools
+Obsoletes:	QtUiTools
 
 %description -n QtUiTools-static
 Classes for handling Qt Designer forms in applications - static
@@ -1112,7 +1099,6 @@
 
 # install tools
 install bin/findtr	$RPM_BUILD_ROOT%{_qtdir}/bin
-#install bin/qvfb	$RPM_BUILD_ROOT%{_bindir}
 install bin/pixeltool	$RPM_BUILD_ROOT%{_bindir}
 install bin/qdbus	$RPM_BUILD_ROOT%{_bindir}
 install bin/qdbuscpp2xml	$RPM_BUILD_ROOT%{_bindir}
@@ -1322,9 +1308,6 @@
 %post	-n QtDesigner	-p /sbin/ldconfig
 %postun	-n QtDesigner	-p /sbin/ldconfig
 
-%post	-n QtUiTools	-p /sbin/ldconfig
-%postun	-n QtUiTools	-p /sbin/ldconfig
-
 %files -n QtCore
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQtCore.so.*.*
@@ -1449,10 +1432,6 @@
 %dir %{_qtdir}/plugins/designer
 %attr(755,root,root) %{_qtdir}/plugins/designer/*.so
 
-%files -n QtUiTools
-%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/libQtUiTools.so.*.*
-
 %files assistant
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pixeltool
@@ -1508,10 +1487,6 @@
 %{_desktopdir}/qt4-qtconfig.desktop
 %{_pixmapsdir}/qt4-qtconfig.png
 
-#%files -n qvfb
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_bindir}/qvfb
-
 %files doc
 %defattr(644,root,root,755)
 %{_docdir}/%{name}-doc
@@ -1611,6 +1586,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129.2.7  2007/05/31 00:15:02  shadzik
+- since 4.3.0 QtUiTools is just static, so remove QtUiTools subpackage
+- P: and O: QtUiTools to QtUiTools-static
+
 Revision 1.129.2.6  2007/05/30 18:44:30  shadzik
 - add pixeltool binary to QtDesigner
 
================================================================

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