Author: djurban Date: Sat Apr 22 13:48:01 2006 GMT
Module: SPECS Tag: qt-copy
---- Log message:
- update to current qt-copy, i need to put the sources on df somewher once i
reenerate them
---- Files affected:
SPECS:
qt4.spec (1.30.2.6 -> 1.30.2.7)
---- Diffs:
================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.30.2.6 SPECS/qt4.spec:1.30.2.7
--- SPECS/qt4.spec:1.30.2.6 Thu Jul 7 09:22:13 2005
+++ SPECS/qt4.spec Sat Apr 22 15:47:56 2006
@@ -3,93 +3,98 @@
# TODO:
# - better descriptions
# - more cleanups
-# - check if translations are avilable
#
# Conditional build:
%bcond_with nas # enable NAS audio support
-# static libs disabled for now
-%bcond_with static_libs # don't build static libraries
+%bcond_without static_libs # build static libraries
%bcond_without cups # disable CUPS support
-%bcond_without designer # don't build designer (it takes long)
-%bcond_without examples # do not build & install examples
-%bcond_without ibase # build ibase (InterBase/Firebird) plugin
%bcond_without mysql # don't build MySQL plugin
%bcond_without odbc # don't build unixODBC plugin
-%bcond_without pch # enable pch in qmake
%bcond_without pgsql # don't build PostgreSQL plugin
-%bcond_without sqlite # don't build SQLite2 plugin
%bcond_without sqlite3 # don't build SQLite3 plugin
+%bcond_without sqlite # don't build SQLite2 plugin
+%bcond_without ibase # don't build ibase (InterBase/Firebird) plugin
+%bcond_without pch # disable pch in qmake
+%bcond_with sse # use SSE instructions in gui/painting module
%ifnarch %{ix86} %{x8664} sparc sparcv9 alpha ppc
%undefine with_ibase
%endif
+
+%ifarch pentium3 pentium4 %{x8664}
+%define with_sse 1
+%endif
+
%define _withsql 1
%{!?with_sqlite3:%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine
_withsql}}}}}}
-%define _ver 4.0.0
-%define _snap 050704
+%define _snap 060422
+%define _name qt-copy
Summary: The Qt GUI application framework
Summary(es): Biblioteca para ejecutar aplicaciones GUI Qt
Summary(pl): Biblioteka Qt do tworzenia GUI
Summary(pt_BR): Estrutura para rodar aplicaçőes GUI Qt
Name: qt4
-Version: %{_ver}.%{_snap}
-Release: 1
+Version: 4.1.2
+Release: 0.%{_snap}.1
License: GPL/QPL
Group: X11/Libraries
-Source0: http://ftp.pld-linux.org/software/kde/qt-copy-%{version}.tar.bz2
-##% Source0-md5: 20ad0c23d8c78889565efbd934e52c96
-Source2: qtconfig.desktop
-Source3: designer.desktop
-Source4: assistant.desktop
-Source5: linguist.desktop
+#Source0:
ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
+Source0: %{_name}-%{_snap}.tar.bz2
+# Source0-md5: 18bca010d09b98e94210710047baca0a
+Source2: %{name}-qtconfig.desktop
+Source3: %{name}-designer.desktop
+Source4: %{name}-assistant.desktop
+Source5: %{name}-linguist.desktop
Patch0: %{name}-tools.patch
-#Patch1: qt-FHS.patch
-# no tutorials exist
-#Patch3: qt-disable_tutorials.patch
Patch2: %{name}-buildsystem.patch
-Patch4: %{name}-locale.patch
-Patch8: %{name}-antialias.patch
-Patch9: %{name}rc1-build.patch
+Patch3: %{name}-locale.patch
+Patch4: %{name}-debug-and-release.patch
+Patch5: %{name}-sse.patch
+Patch6: %{name}-antialias.patch
+Patch7: %{name}-support-cflags-with-commas.patch
+Patch8: %{name}-build-lib-static.patch
+Patch9: %{name}-x11_fonts.patch
URL: http://www.trolltech.com/products/qt/
-Icon: qt.xpm
%{?with_ibase:BuildRequires: Firebird-devel}
-%{?with_sqlite3:BuildRequires: sqlite3-devel}
BuildRequires: OpenGL-devel
+%{?with_sqlite3:BuildRequires: sqlite3-devel}
# incompatible with bison
-BuildRequires: byacc
%{?with_cups:BuildRequires: cups-devel}
-BuildRequires: flex
-BuildRequires: freetype-devel >= 2.0.0
+BuildRequires: fontconfig-devel
+BuildRequires: freetype-devel >= 1:2.0.0
%{?with_pch:BuildRequires: gcc >= 5:3.4.0}
BuildRequires: libjpeg-devel
BuildRequires: libmng-devel >= 1.0.0
-BuildRequires: libpng-devel >= 1.0.8
+BuildRequires: libpng-devel >= 2:1.0.8
BuildRequires: libstdc++-devel
BuildRequires: libungif-devel
%{?with_mysql:BuildRequires: mysql-devel}
%{?with_nas:BuildRequires: nas-devel}
-BuildRequires: perl-base
%{?with_pgsql:BuildRequires: postgresql-backend-devel}
%{?with_pgsql:BuildRequires: postgresql-devel}
-# uncomment this in rel. 1 - no time to upgrade rpm
-#BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.213
BuildRequires: sed >= 4.0
-%{?with_odbc:BuildRequires: unixODBC-devel}
%{?with_sqlite:BuildRequires: sqlite-devel}
+%{?with_odbc:BuildRequires: unixODBC-devel}
BuildRequires: xcursor-devel
BuildRequires: xft-devel
BuildRequires: xrender-devel
BuildRequires: zlib-devel
-Requires: OpenGL
-Conflicts: kdelibs <= 8:3.2-0.030602.1
+# due to -L%{_libdir} before -L%{builddir}/... in makefiles
+BuildConflicts: QtCore-devel < %{version}
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
-%define _noautostrip '.*_debug\\.so*'
+%define _noautostrip '.*_debug\\.so*'
+
+%define specflags -fno-strict-aliasing
+
+%define _qtdir %{_libdir}/qt4
%description
Qt is a complete C++ application development framework, which includes
@@ -123,240 +128,577 @@
na Qt aplikacji korzystających z Motif oraz pisanie wtyczek z
wykorzystaniem Netscape LiveConnect.
-%package devel
-Summary: development files
-Summary(pl): pliki programistyczne
-Group: X11/Development/Libraries
-Requires: %{name}-QtCore = %{epoch}:%{version}-%{release}
-Requires: %{name}-QtGui = %{epoch}:%{version}-%{release}
-Requires: %{name}-QtNetwork = %{epoch}:%{version}-%{release}
-Requires: %{name}-QtOpenGL = %{epoch}:%{version}-%{release}
-Requires: %{name}-Qt3Support = %{epoch}:%{version}-%{release}
-Requires: %{name}-QtXml = %{epoch}:%{version}-%{release}
-Requires: %{name}-designer-libs = %{epoch}:%{version}-%{release}
-
-%description devel
-development files.
-
-%description devel -l pl
-pliki programistyczne.
-
-%package Qt3Support
-Summary: Qt3 compatibility library
-Summary(pl): Biblioteka kompatybilności z Qt3
-Group: X11/Libraries
-Requires: %{name}-QtCore = %{epoch}:%{version}-%{release}
-
-%description Qt3Support
-Qt3 compatibility library.
-
-%description Qt3Support -l pl
-Biblioteka kompatybilności z Qt3.
-
-%package QtCore
+%package -n QtCore
Summary: Core classes used by other modules
Summary(pl): Podstawowe klasy używane przez inne moduły
Group: X11/Libraries
-%description QtCore
+%description -n QtCore
Core classes used by other modules.
-%description QtCore -l pl
+%description -n QtCore -l pl
Podstawowe klasy używane przez inne moduły.
-%package QtGui
+%package -n QtCore-devel
+Summary: Core classes used by other modules - development files
+Summary(pl): Podstawowe klasy używane przez inne moduły - pliki
programistyczne
+Group: X11/Development/Libraries
+Requires: QtCore = %{version}-%{release}
+Requires: libstdc++-devel
+Requires: zlib-devel
+
+%description -n QtCore-devel
+Core classes used by other modules - development files.
+
+%description -n QtCore-devel -l pl
+Podstawowe klasy używane przez inne moduły - pliki programistyczne.
+
+%package -n QtCore-static
+Summary: Core classes used by other modules - static libraries
+Summary(pl): Podstawowe klasy używane przez inne moduły - biblioteki
statyczne
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{version}-%{release}
+
+%description -n QtCore-static
+Core classes used by other modules - static libraries.
+
+%description -n QtCore-static -l pl
+Podstawowe klasy używane przez inne moduły - biblioteki statyczne.
+
+%package -n QtGui
Summary: Graphical User Interface components
Summary(pl): Komponenty graficznego interfejsu użytkownika
Group: X11/Libraries
-Requires: %{name}-QtCore = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
+# two following because of some plugins
+Requires: Qt3Support = %{version}-%{release}
+Requires: QtSql = %{version}-%{release}
-%description QtGui
+%description -n QtGui
Graphical User Interface components.
-%description QtGui -l pl
+%description -n QtGui -l pl
Komponenty graficznego interfejsu użytkownika.
-%package QtNetwork
+%package -n QtGui-devel
+Summary: Graphical User Interface components - development files
+Summary(pl): Komponenty graficznego interfejsu użytkownika - pliki
programistyczne
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{version}-%{release}
+Requires: QtGui = %{version}-%{release}
+Requires: fontconfig-devel
+Requires: freetype-devel >= 1:2.0.0
+Requires: libpng-devel >= 2:1.0.8
+Requires: xcursor-devel
+Requires: xrender-devel
+
+%description -n QtGui-devel
+Graphical User Interface components - development files.
+
+%description -n QtGui-devel -l pl
+Komponenty graficznego interfejsu użytkownika - pliki programistyczne.
+
+%package -n QtGui-static
+Summary: Graphical User Interface components - static libraries
+Summary(pl): Komponenty graficznego interfejsu użytkownika - biblioteki
statyczne
+Group: X11/Development/Libraries
+Requires: QtGui-devel = %{version}-%{release}
+
+%description -n QtGui-static
+Graphical User Interface components - static libraries.
+
+%description -n QtGui-static -l pl
+Komponenty graficznego interfejsu użytkownika - biblioteki statyczne.
+
+%package -n QtNetwork
Summary: Classes for network programming
Summary(pl): Klasy do programowania sieciowego
Group: X11/Libraries
-Requires: %{name}-QtCore = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
-%description QtNetwork
+%description -n QtNetwork
Classes for network programming.
-%description QtNetwork -l pl
+%description -n QtNetwork -l pl
Klasy do programowania sieciowego.
-%package QtOpenGL
+%package -n QtNetwork-devel
+Summary: Classes for network programming - development files
+Summary(pl): Klasy do programowania sieciowego - pliki programistyczne
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{version}-%{release}
+Requires: QtNetwork = %{version}-%{release}
+
+%description -n QtNetwork-devel
+Classes for network programming - development files.
+
+%description -n QtNetwork-devel -l pl
+Klasy do programowania sieciowego - pliki programistyczne.
+
+%package -n QtNetwork-static
+Summary: Classes for network programming - static libraries
+Summary(pl): Klasy do programowania sieciowego - biblioteki statyczne
+Group: X11/Development/Libraries
+Requires: QtNetwork-devel = %{version}-%{release}
+
+%description -n QtNetwork-static
+Classes for network programming - static libraries.
+
+%description -n QtNetwork-static -l pl
+Klasy do programowania sieciowego - biblioteki statyczne.
+
+%package -n QtOpenGL
Summary: OpenGL support classes
Summary(pl): Klasy wspomagające OpenGL
Group: X11/Libraries
-Requires: %{name}-QtCore = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
-%description QtOpenGL
+%description -n QtOpenGL
OpenGL support classes.
-%description QtOpenGL -l pl
+%description -n QtOpenGL -l pl
Klasy wspomagające OpenGL.
-%package QtSql
+%package -n QtOpenGL-devel
+Summary: OpenGL support classes - development files
+Summary(pl): Klasy wspomagające OpenGL - pliki programistyczne
+Group: X11/Development/Libraries
+Requires: OpenGL-devel
+Requires: QtCore-devel = %{version}-%{release}
+Requires: QtOpenGL = %{version}-%{release}
+
+%description -n QtOpenGL-devel
+OpenGL support classes - development files.
+
+%description -n QtOpenGL-devel -l pl
+Klasy wspomagające OpenGL - pliki programistyczne.
+
+%package -n QtOpenGL-static
+Summary: OpenGL support classes - static libraries
+Summary(pl): Klasy wspomagające OpenGL - biblioteki statyczne
+Group: X11/Development/Libraries
+Requires: QtOpenGL-devel = %{version}-%{release}
+
+%description -n QtOpenGL-static
+OpenGL support classes - static libraries.
+
+%description -n QtOpenGL-devel -l pl
+Klasy wspomagające OpenGL - biblioteki statyczne.
+
+%package -n QtSql
Summary: Classes for database integration using SQL
Summary(pl): Klasy do integracji z bazami danych przy użyciu SQL
Group: X11/Libraries
-Requires: %{name}-QtCore = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
-%description QtSql
+%description -n QtSql
Classes for database integration using SQL.
-%description QtSql -l pl
+%description -n QtSql -l pl
Klasy do integracji z bazami danych przy użyciu SQL.
-%package QtSql-devel
+%package -n QtSql-devel
Summary: Classes for database integration using SQL - development files
Summary(pl): Klasy do integracji z bazami danych przy użyciu SQL - pliki
programistyczne
Group: X11/Development/Libraries
-Requires: %{name}-devel = %{epoch}:%{version}-%{release}
-Requires: %{name}-QtSql = %{epoch}:%{version}-%{release}
+Requires: QtCore-devel = %{version}-%{release}
+Requires: QtSql = %{version}-%{release}
-%description QtSql-devel
+%description -n QtSql-devel
Classes for database integration using SQL - development files.
-%description QtSql-devel -l pl
+%description -n QtSql-devel -l pl
Klasy do integracji z bazami danych przy użyciu SQL - pliki
programistyczne.
-%package QtSql-ibase
+%package -n QtSql-static
+Summary: Classes for database integration using SQL - static libraries
+Summary(pl): Klasy do integracji z bazami danych przy użyciu SQL -
biblioteki statyczne
+Group: X11/Development/Libraries
+Requires: QtSql-devel = %{version}-%{release}
+
+%description -n QtSql-static
+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.
+
+%package -n QtSql-ibase
Summary: Database plugin for InterBase/Firebird Qt support
Summary(pl): Wtyczka InterBase/Firebird do Qt
Summary(pt_BR): Plugin de suporte a InterBase/Firebird para Qt
Group: X11/Libraries
-Requires: %{name}-QtSql = %{epoch}:%{version}-%{release}
-Provides: %{name}-QtSql-backend = %{epoch}:%{version}-%{release}
+Requires: QtSql = %{version}-%{release}
+Provides: QtSql-backend = %{version}-%{release}
-%description QtSql-ibase
+%description -n QtSql-ibase
This package contains a plugin for accessing Interbase/Firebird
database via the QSql classes.
-%description QtSql-ibase -l pl
+%description -n QtSql-ibase -l pl
Ten pakiet zawiera wtyczki do Qt umożliwiające korzystanie z baz
danych Interbase/Firebird poprzez klasy QSql.
-%description QtSql-ibase -l pt_BR
+%description -n QtSql-ibase -l pt_BR
Plugin de suporte a InterBase/Firebird para Qt.
-%package QtSql-mysql
+%package -n QtSql-mysql
Summary: Database plugin for MySQL Qt support
Summary(pl): Wtyczka MySQL do Qt
Summary(pt_BR): Plugin de suporte a MySQL para Qt
Group: X11/Libraries
-Requires: %{name}-QtSql = %{epoch}:%{version}-%{release}
-Provides: %{name}-QtSql-backend = %{epoch}:%{version}-%{release}
+Requires: QtSql = %{version}-%{release}
+Provides: QtSql-backend = %{version}-%{release}
-%description QtSql-mysql
+%description -n QtSql-mysql
This package contains a plugin for accessing MySQL database via the
QSql classes.
-%description QtSql-mysql -l pl
+%description -n QtSql-mysql -l pl
Ten pakiet zawiera wtyczki do Qt umożliwiające korzystanie z baz
danych MySQL poprzez klasy QSql.
-%description QtSql-mysql -l pt_BR
+%description -n QtSql-mysql -l pt_BR
Plugin de suporte a MySQL para Qt.
-%package QtSql-odbc
+%package -n QtSql-odbc
Summary: Database plugin for ODBC Qt support
Summary(pl): Wtyczka ODBC do Qt
Summary(pt_BR): Plugin de suporte a ODBC para Qt
Group: X11/Libraries
-Requires: %{name}-QtSql = %{epoch}:%{version}-%{release}
-Provides: %{name}-QtSql-backend = %{epoch}:%{version}-%{release}
+Requires: QtSql = %{version}-%{release}
+Provides: QtSql-backend = %{version}-%{release}
-%description QtSql-odbc
+%description -n QtSql-odbc
This package contains a plugin for accessing unixODBC services via the
QSql classes.
-%description QtSql-odbc -l pl
+%description -n QtSql-odbc -l pl
Ten pakiet zawiera wtyczki do Qt umożliwiające korzystanie z usług
unixODBC poprzez klasy QSql.
-%description QtSql-odbc -l pt_BR
+%description -n QtSql-odbc -l pt_BR
Plugin de suporte a ODBC para Qt.
-%package QtSql-pgsql
+%package -n QtSql-pgsql
Summary: Database plugin for PostgreSQL Qt support
Summary(pl): Wtyczka PostgreSQL do Qt
Summary(pt_BR): Plugin de suporte a PostgreSQL para Qt
Group: X11/Libraries
-Requires: %{name}-QtSql = %{epoch}:%{version}-%{release}
-Provides: %{name}-QtSql-backend = %{epoch}:%{version}-%{release}
+Requires: QtSql = %{version}-%{release}
+Provides: QtSql-backend = %{version}-%{release}
-%description QtSql-pgsql
+%description -n QtSql-pgsql
This package contains a plugin for accessing PostgreSQL database via
the QSql classes.
-%description QtSql-pgsql -l pl
+%description -n QtSql-pgsql -l pl
Ten pakiet zawiera wtyczki do Qt umożliwiające korzystanie z baz
danych PostgreSQL poprzez klasy QSql.
-%description QtSql-pgsql -l es
+%description -n QtSql-pgsql -l es
Plugin de suporte a PostgreSQL para Qt.
-%package QtSql-sqlite
+%package -n QtSql-sqlite
Summary: Database plugin for SQLite 2.x Qt support
Summary(pl): Wtyczka SQLite 2.x do Qt
Summary(pt_BR): Plugin de suporte a SQLite 2.x para Qt
Group: X11/Libraries
-Requires: %{name}-QtSql = %{epoch}:%{version}-%{release}
-Provides: %{name}-QtSql-backend = %{epoch}:%{version}-%{release}
+Requires: QtSql = %{version}-%{release}
+Provides: QtSql-backend = %{version}-%{release}
-%description QtSql-sqlite
+%description -n QtSql-sqlite
This package contains a plugin for using the SQLite 2.x library (which
allows to acces virtually any SQL database) via the QSql classes.
-%description QtSql-sqlite -l pl
+%description -n QtSql-sqlite -l pl
Ten pakiet zawiera wtyczki do Qt umożliwiające korzystanie z baz
danych SQLite 2.x poprzez klasy QSql.
-%description QtSql-sqlite -l pt_BR
+%description -n QtSql-sqlite -l pt_BR
Plugin de suporte a SQLite 2.x para Qt.
-%package QtSql-sqlite3
+%package -n QtSql-sqlite3
Summary: Database plugin for SQLite3 Qt support
Summary(pl): Wtyczka SQLite3 do Qt
Summary(pt_BR): Plugin de suporte a SQLite3 para Qt
Group: X11/Libraries
-Provides: %{name}-QtSql-backend = %{epoch}:%{version}-%{release}
-Requires: %{name}-QtSql = %{epoch}:%{version}-%{release}
+Requires: QtSql = %{version}-%{release}
+Provides: QtSql-backend = %{version}-%{release}
-%description QtSql-sqlite3
+%description -n QtSql-sqlite3
This package contains a plugin for using the SQLite3 library (which
allows to acces virtually any SQL database) via the QSql classes.
-%description QtSql-sqlite3 -l pl
+%description -n QtSql-sqlite3 -l pl
Ten pakiet zawiera wtyczki do Qt umożliwiające korzystanie z baz
danych SQLite3 poprzez klasy QSql.
-%description QtSql-sqlite3 -l pt_BR
+%description -n QtSql-sqlite3 -l pt_BR
Plugin de suporte a SQLite3 para Qt.
-%package QtXml
+%package -n QtSvg
+Summary: SVG support
+Summary(pl): Wsparcie dla SVG
+Group: X11/Libraries
+Requires: QtCore = %{version}-%{release}
+
+%description -n QtSvg
+SVG support.
+
+%description -n QtSvg -l pl
+Wsparcie dla SVG.
+
+%package -n QtSvg-devel
+Summary: SVG support - development files
+Summary(pl): Wsparcie dla SVG - pliki programistyczne
+Group: X11/Development/Libraries
+Requires: QtCore-devel = %{version}-%{release}
+Requires: QtSvg = %{version}-%{release}
+
+%description -n QtSvg-devel
+SVG support - development files.
+
+%description -n QtSvg-devel -l pl
+Wsparcie dla SVG - pliki programistyczne.
+
+%package -n QtSvg-static
+Summary: SVG support - static libraries
+Summary(pl): Wsparcie dla SVG - biblioteki statyczne
+Group: X11/Development/Libraries
+Requires: QtSvg-devel = %{version}-%{release}
+
+%description -n QtSvg-static
+SVG support - static libraries.
+
+%description -n QtSvg-static -l pl
+Wsparcie dla SVG - biblioteki statyczne.
+
+%package -n QtTest
+Summary: Test framework
+Summary(pl): Szkielet testów
+Group: X11/Libraries
+Requires: QtCore = %{version}-%{release}
+
+%description -n QtTest
+Test framework.
+
+%description -n QtTest -l pl
+Szkielet testów.
+
+%package -n QtTest-devel
+Summary: Test framework - development files
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.30.2.6&r2=1.30.2.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
