SPECS: qt4.spec - adapterized

[glen]

Author: glen                         Date: Thu Jan 12 22:07:47 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapterized

---- Files affected:
SPECS:
   qt4.spec (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.47 SPECS/qt4.spec:1.48
--- SPECS/qt4.spec:1.47	Thu Jan 12 23:04:46 2006
+++ SPECS/qt4.spec	Thu Jan 12 23:07:41 2006
@@ -55,6 +55,7 @@
 Patch10:	%{name}-support-cflags-with-commas.patch
 URL:		http://www.trolltech.com/products/qt/
 Icon:		qt.xpm
+BuildConflicts:	QtCore
 %{?with_ibase:BuildRequires:	Firebird-devel}
 BuildRequires:	OpenGL-devel
 %{?with_sqlite3:BuildRequires:	sqlite3-devel}
@@ -83,11 +84,10 @@
 BuildRequires:	xft-devel
 BuildRequires:	xrender-devel
 BuildRequires:	zlib-devel
-BuildConflicts:	QtCore
 Requires:	OpenGL
-Conflicts:	kdelibs <= 8:3.2-0.030602.1
 Obsoletes:	qt-extensions
 Obsoletes:	qt-utils
+Conflicts:	kdelibs <= 8:3.2-0.030602.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautoreqdep	libGL.so.1 libGLU.so.1
@@ -307,11 +307,11 @@
 Classes for database integration using SQL - static libraries.
 
 %description -n QtSql-static -l pl
-Klasy do integracji z bazami danych przy użyciu SQL - biblioteki statyczne.
-programistyczne.
+Klasy do integracji z bazami danych przy użyciu SQL - biblioteki
+statyczne. programistyczne.
 
 %package -n QtSvg
-Summary:	SVG support.
+Summary:	SVG support
 Summary(pl):	Wsparcie dla SVG.
 Group:		X11/Libraries
 Requires:	QtCore = %{epoch}:%{version}-%{release}
@@ -323,7 +323,7 @@
 Wsparcie dla SVG.
 
 %package -n QtSvg-devel
-Summary:	SVG support - development files.
+Summary:	SVG support - development files
 Summary(pl):	Wsparcie dla SVG - pliki programistyczne.
 Group:		X11/Development/Libraries
 Requires:	QtCore-devel = %{epoch}:%{version}-%{release}
@@ -336,7 +336,7 @@
 Wsparcie dla SVG - pliki programistyczne.
 
 %package -n QtSvg-static
-Summary:	SVG support - static libraries.
+Summary:	SVG support - static libraries
 Summary(pl):	Wsparcie dla SVG - biblioteki statyczne.
 Group:		X11/Development/Libraries
 Requires:	QtSvg-devel = %{epoch}:%{version}-%{release}
@@ -447,8 +447,8 @@
 Summary(pl):	Wtyczka SQLite3 do Qt
 Summary(pt_BR):	Plugin de suporte a SQLite3 para Qt
 Group:		X11/Libraries
-Provides:	QtSql-backend = %{epoch}:%{version}-%{release}
 Requires:	QtSql = %{epoch}:%{version}-%{release}
+Provides:	QtSql-backend = %{epoch}:%{version}-%{release}
 
 %description -n QtSql-sqlite3
 This package contains a plugin for using the SQLite3 library (which
@@ -462,7 +462,7 @@
 Plugin de suporte a SQLite3 para Qt.
 
 %package -n QtTest
-Summary:	Test framework.
+Summary:	Test framework
 Group:		X11/Libraries
 Requires:	QtCore = %{epoch}:%{version}-%{release}
 
@@ -470,7 +470,7 @@
 Test framework.
 
 %package -n QtTest-devel
-Summary:	Test framework - development files.
+Summary:	Test framework - development files
 Group:		X11/Development/Libraries
 Requires:	QtCore-devel = %{epoch}:%{version}-%{release}
 Requires:	QtTest = %{epoch}:%{version}-%{release}
@@ -620,7 +620,8 @@
 IDE used for GUI designing with Qt library - static libraries.
 
 %description -n QtDesigner-static -l pl
-IDE służące do projektowania GUI za pomocą biblioteki Qt - biblioteki statyczne.
+IDE służące do projektowania GUI za pomocą biblioteki Qt - biblioteki
+statyczne.
 
 %package designer-libs
 Summary:	Libraries IDE used for GUI designing with Qt library
@@ -1093,7 +1094,7 @@
 
 %files -n QtCore
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
+#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
 %attr(755,root,root) %{_libdir}/libQtCore*.so.*
 %dir %{_libdir}/qt4
 %dir %{_libdir}/qt4/plugins
@@ -1303,6 +1304,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2006/01/12 22:07:41  glen
+- adapterized
+
 Revision 1.47  2006/01/12 22:04:46  glen
 - no need to %if package definitions (%files is sufficent)
 
================================================================

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