Author: qboosh Date: Wed Jan 25 18:16:32 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- no epoch in internal deps (Epoch not defined)
- (f)lex and (b)yacc are not used during build
- QtGui depends on Qt3Support and QtSql (because of some plugins)
---- Files affected:
SPECS:
qt4.spec (1.60 -> 1.61)
---- Diffs:
================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.60 SPECS/qt4.spec:1.61
--- SPECS/qt4.spec:1.60 Tue Jan 24 08:41:05 2006
+++ SPECS/qt4.spec Wed Jan 25 19:16:25 2006
@@ -1,6 +1,7 @@
# $Revision$, $Date$
#
# TODO:
+# - kill -L/inside/builddir from *.la
# - better descriptions
# - more cleanups
# - check if translations are available
@@ -65,9 +66,7 @@
BuildRequires: OpenGL-devel
%{?with_sqlite3:BuildRequires: sqlite3-devel}
# incompatible with bison
-BuildRequires: byacc
%{?with_cups:BuildRequires: cups-devel}
-BuildRequires: flex
BuildRequires: freetype-devel >= 1:2.0.0
%{?with_pch:BuildRequires: gcc >= 5:3.4.0}
BuildRequires: libjpeg-devel
@@ -148,7 +147,7 @@
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 = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
Requires: libstdc++-devel
Requires: zlib-devel
@@ -162,7 +161,7 @@
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 = %{epoch}:%{version}-%{release}
+Requires: QtCore-devel = %{version}-%{release}
%description -n QtCore-static
Core classes used by other modules - static libraries.
@@ -174,7 +173,10 @@
Summary: Graphical User Interface components
Summary(pl): Komponenty graficznego interfejsu użytkownika
Group: X11/Libraries
-Requires: QtCore = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
+# two following because of some plugins
+Requires: Qt3Support = %{version}-%{release}
+Requires: QtSql = %{version}-%{release}
%description -n QtGui
Graphical User Interface components.
@@ -186,8 +188,8 @@
Summary: Graphical User Interface components - development files
Summary(pl): Komponenty graficznego interfejsu użytkownika - pliki
programistyczne
Group: X11/Development/Libraries
-Requires: QtCore-devel = %{epoch}:%{version}-%{release}
-Requires: QtGui = %{epoch}:%{version}-%{release}
+Requires: QtCore-devel = %{version}-%{release}
+Requires: QtGui = %{version}-%{release}
Requires: freetype-devel >= 1:2.0.0
Requires: libpng-devel >= 2:1.0.8
Requires: xcursor-devel
@@ -203,7 +205,7 @@
Summary: Graphical User Interface components - static libraries
Summary(pl): Komponenty graficznego interfejsu użytkownika - biblioteki
statyczne
Group: X11/Development/Libraries
-Requires: QtGui-devel = %{epoch}:%{version}-%{release}
+Requires: QtGui-devel = %{version}-%{release}
%description -n QtGui-static
Graphical User Interface components - static libraries.
@@ -215,7 +217,7 @@
Summary: Classes for network programming
Summary(pl): Klasy do programowania sieciowego
Group: X11/Libraries
-Requires: QtCore = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
%description -n QtNetwork
Classes for network programming.
@@ -227,8 +229,8 @@
Summary: Classes for network programming - development files
Summary(pl): Klasy do programowania sieciowego - pliki programistyczne
Group: X11/Development/Libraries
-Requires: QtCore-devel = %{epoch}:%{version}-%{release}
-Requires: QtNetwork = %{epoch}:%{version}-%{release}
+Requires: QtCore-devel = %{version}-%{release}
+Requires: QtNetwork = %{version}-%{release}
%description -n QtNetwork-devel
Classes for network programming - development files.
@@ -240,7 +242,7 @@
Summary: Classes for network programming - static libraries
Summary(pl): Klasy do programowania sieciowego - biblioteki statyczne
Group: X11/Development/Libraries
-Requires: QtNetwork-devel = %{epoch}:%{version}-%{release}
+Requires: QtNetwork-devel = %{version}-%{release}
%description -n QtNetwork-static
Classes for network programming - static libraries.
@@ -252,7 +254,7 @@
Summary: OpenGL support classes
Summary(pl): Klasy wspomagające OpenGL
Group: X11/Libraries
-Requires: QtCore = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
%description -n QtOpenGL
OpenGL support classes.
@@ -265,8 +267,8 @@
Summary(pl): Klasy wspomagające OpenGL - pliki programistyczne
Group: X11/Development/Libraries
Requires: OpenGL-devel
-Requires: QtCore-devel = %{epoch}:%{version}-%{release}
-Requires: QtOpenGL = %{epoch}:%{version}-%{release}
+Requires: QtCore-devel = %{version}-%{release}
+Requires: QtOpenGL = %{version}-%{release}
%description -n QtOpenGL-devel
OpenGL support classes - development files.
@@ -278,7 +280,7 @@
Summary: OpenGL support classes - static libraries
Summary(pl): Klasy wspomagające OpenGL - biblioteki statyczne
Group: X11/Development/Libraries
-Requires: QtOpenGL-devel = %{epoch}:%{version}-%{release}
+Requires: QtOpenGL-devel = %{version}-%{release}
%description -n QtOpenGL-static
OpenGL support classes - static libraries.
@@ -290,7 +292,7 @@
Summary: Classes for database integration using SQL
Summary(pl): Klasy do integracji z bazami danych przy użyciu SQL
Group: X11/Libraries
-Requires: QtCore = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
%description -n QtSql
Classes for database integration using SQL.
@@ -302,8 +304,8 @@
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: QtCore-devel = %{epoch}:%{version}-%{release}
-Requires: QtSql = %{epoch}:%{version}-%{release}
+Requires: QtCore-devel = %{version}-%{release}
+Requires: QtSql = %{version}-%{release}
%description -n QtSql-devel
Classes for database integration using SQL - development files.
@@ -316,7 +318,7 @@
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 = %{epoch}:%{version}-%{release}
+Requires: QtSql-devel = %{version}-%{release}
%description -n QtSql-static
Classes for database integration using SQL - static libraries.
@@ -330,8 +332,8 @@
Summary(pl): Wtyczka InterBase/Firebird do Qt
Summary(pt_BR): Plugin de suporte a InterBase/Firebird para Qt
Group: X11/Libraries
-Requires: QtSql = %{epoch}:%{version}-%{release}
-Provides: QtSql-backend = %{epoch}:%{version}-%{release}
+Requires: QtSql = %{version}-%{release}
+Provides: QtSql-backend = %{version}-%{release}
%description -n QtSql-ibase
This package contains a plugin for accessing Interbase/Firebird
@@ -349,8 +351,8 @@
Summary(pl): Wtyczka MySQL do Qt
Summary(pt_BR): Plugin de suporte a MySQL para Qt
Group: X11/Libraries
-Requires: QtSql = %{epoch}:%{version}-%{release}
-Provides: QtSql-backend = %{epoch}:%{version}-%{release}
+Requires: QtSql = %{version}-%{release}
+Provides: QtSql-backend = %{version}-%{release}
%description -n QtSql-mysql
This package contains a plugin for accessing MySQL database via the
@@ -368,8 +370,8 @@
Summary(pl): Wtyczka ODBC do Qt
Summary(pt_BR): Plugin de suporte a ODBC para Qt
Group: X11/Libraries
-Requires: QtSql = %{epoch}:%{version}-%{release}
-Provides: QtSql-backend = %{epoch}:%{version}-%{release}
+Requires: QtSql = %{version}-%{release}
+Provides: QtSql-backend = %{version}-%{release}
%description -n QtSql-odbc
This package contains a plugin for accessing unixODBC services via the
@@ -387,8 +389,8 @@
Summary(pl): Wtyczka PostgreSQL do Qt
Summary(pt_BR): Plugin de suporte a PostgreSQL para Qt
Group: X11/Libraries
-Requires: QtSql = %{epoch}:%{version}-%{release}
-Provides: QtSql-backend = %{epoch}:%{version}-%{release}
+Requires: QtSql = %{version}-%{release}
+Provides: QtSql-backend = %{version}-%{release}
%description -n QtSql-pgsql
This package contains a plugin for accessing PostgreSQL database via
@@ -406,8 +408,8 @@
Summary(pl): Wtyczka SQLite 2.x do Qt
Summary(pt_BR): Plugin de suporte a SQLite 2.x para Qt
Group: X11/Libraries
-Requires: QtSql = %{epoch}:%{version}-%{release}
-Provides: QtSql-backend = %{epoch}:%{version}-%{release}
+Requires: QtSql = %{version}-%{release}
+Provides: QtSql-backend = %{version}-%{release}
%description -n QtSql-sqlite
This package contains a plugin for using the SQLite 2.x library (which
@@ -425,8 +427,8 @@
Summary(pl): Wtyczka SQLite3 do Qt
Summary(pt_BR): Plugin de suporte a SQLite3 para Qt
Group: X11/Libraries
-Requires: QtSql = %{epoch}:%{version}-%{release}
-Provides: QtSql-backend = %{epoch}:%{version}-%{release}
+Requires: QtSql = %{version}-%{release}
+Provides: QtSql-backend = %{version}-%{release}
%description -n QtSql-sqlite3
This package contains a plugin for using the SQLite3 library (which
@@ -443,7 +445,7 @@
Summary: SVG support
Summary(pl): Wsparcie dla SVG
Group: X11/Libraries
-Requires: QtCore = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
%description -n QtSvg
SVG support.
@@ -455,8 +457,8 @@
Summary: SVG support - development files
Summary(pl): Wsparcie dla SVG - pliki programistyczne
Group: X11/Development/Libraries
-Requires: QtCore-devel = %{epoch}:%{version}-%{release}
-Requires: QtSvg = %{epoch}:%{version}-%{release}
+Requires: QtCore-devel = %{version}-%{release}
+Requires: QtSvg = %{version}-%{release}
%description -n QtSvg-devel
SVG support - development files.
@@ -468,7 +470,7 @@
Summary: SVG support - static libraries
Summary(pl): Wsparcie dla SVG - biblioteki statyczne
Group: X11/Development/Libraries
-Requires: QtSvg-devel = %{epoch}:%{version}-%{release}
+Requires: QtSvg-devel = %{version}-%{release}
%description -n QtSvg-static
SVG support - static libraries.
@@ -480,7 +482,7 @@
Summary: Test framework
Summary(pl): Szkielet testów
Group: X11/Libraries
-Requires: QtCore = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
%description -n QtTest
Test framework.
@@ -492,8 +494,8 @@
Summary: Test framework - development files
Summary(pl): Szkielet testów - pliki programistyczne
Group: X11/Development/Libraries
-Requires: QtCore-devel = %{epoch}:%{version}-%{release}
-Requires: QtTest = %{epoch}:%{version}-%{release}
+Requires: QtCore-devel = %{version}-%{release}
+Requires: QtTest = %{version}-%{release}
%description -n QtTest-devel
Test framework - development files.
@@ -505,7 +507,7 @@
Summary: Classes for handling XML
Summary(pl): Klasy do obsługi XML-a
Group: X11/Libraries
-Requires: QtCore = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
%description -n QtXml
Classes for handling XML.
@@ -517,8 +519,8 @@
Summary: Classes for handling XML - development files
Summary(pl): Klasy do obsługi XML-a - pliki programistyczne
Group: X11/Development/Libraries
-Requires: QtCore-devel = %{epoch}:%{version}-%{release}
-Requires: QtXml = %{epoch}:%{version}-%{release}
+Requires: QtCore-devel = %{version}-%{release}
+Requires: QtXml = %{version}-%{release}
%description -n QtXml-devel
Classes for handling XML - development files.
@@ -530,7 +532,7 @@
Summary: Classes for handling XML - static libraries
Summary(pl): Klasy do obsługi XML-a - biblioteki statyczne
Group: X11/Development/Libraries
-Requires: QtXml-devel = %{epoch}:%{version}-%{release}
+Requires: QtXml-devel = %{version}-%{release}
%description -n QtXml-static
Classes for handling XML - static libraries.
@@ -542,7 +544,7 @@
Summary: Qt3 compatibility library
Summary(pl): Biblioteka kompatybilności z Qt3
Group: X11/Libraries
-Requires: QtCore = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
%description -n Qt3Support
Qt3 compatibility library.
@@ -554,8 +556,8 @@
Summary: Qt3 compatibility library - development files
Summary(pl): Biblioteka kompatybilności z Qt3 - pliki programistyczne
Group: X11/Development/Libraries
-Requires: Qt3Support = %{epoch}:%{version}-%{release}
-Requires: QtCore-devel = %{epoch}:%{version}-%{release}
+Requires: Qt3Support = %{version}-%{release}
+Requires: QtCore-devel = %{version}-%{release}
%description -n Qt3Support-devel
Qt3 compatibility library - development files.
@@ -567,7 +569,7 @@
Summary: Qt3 compatibility library - static libraries
Summary(pl): Biblioteka kompatybilności z Qt3 - biblioteki statyczne
Group: X11/Development/Libraries
-Requires: Qt3Support-devel = %{epoch}:%{version}-%{release}
+Requires: Qt3Support-devel = %{version}-%{release}
%description -n Qt3Support-static
Qt3 compatibility library - static libraries.
@@ -593,8 +595,8 @@
Summary: Build tools for Qt4
Summary(pl): Narzędzia do budowania dla Qt4
Group: X11/Development/Tools
-Requires: QtCore = %{epoch}:%{version}-%{release}
-Requires: QtXml = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
+Requires: QtXml = %{version}-%{release}
%description build
This package includes the Qt resource compiler (rcc), meta objects
@@ -610,7 +612,7 @@
Summary: IDE used for GUI designing with Qt library
Summary(pl): IDE służące do projektowania GUI za pomocą biblioteki Qt
Group: X11/Applications
-Requires: %{name}-designer-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-designer-libs = %{version}-%{release}
%description designer
An advanced tool used for GUI designing with Qt library.
@@ -623,8 +625,8 @@
Summary: IDE used for GUI designing with Qt library - development files
Summary(pl): IDE służące do projektowania GUI za pomocą biblioteki Qt -
pliki programistyczne
Group: X11/Development/Libraries
-Requires: %{name}-designer-libs = %{epoch}:%{version}-%{release}
-Requires: QtCore-devel = %{epoch}:%{version}-%{release}
+Requires: %{name}-designer-libs = %{version}-%{release}
+Requires: QtCore-devel = %{version}-%{release}
%description -n QtDesigner-devel
IDE used for GUI designing with Qt library - development files.
@@ -637,7 +639,7 @@
Summary: IDE used for GUI designing with Qt library - static libraries
Summary(pl): IDE służące do projektowania GUI za pomocą biblioteki Qt -
biblioteki statyczne
Group: X11/Development/Libraries
-Requires: QtDesigner-devel = %{epoch}:%{version}-%{release}
+Requires: QtDesigner-devel = %{version}-%{release}
%description -n QtDesigner-static
IDE used for GUI designing with Qt library - static libraries.
@@ -719,8 +721,8 @@
Summary: Demos of new Qt4 features
Summary(pl): Programy demonstrujące nowe możliwości Qt4
Group: X11/Development/Libraries
-Requires: QtCore = %{epoch}:%{version}-%{release}
-Requires: QtXml = %{epoch}:%{version}-%{release}
+Requires: QtCore = %{version}-%{release}
+Requires: QtXml = %{version}-%{release}
%description demos
Demos are spiders that fly.
@@ -757,7 +759,7 @@
Group: X11/Development/Libraries
# no it does not , we cant be sure the user wants to compile them right?
# he might just want to take a look, anwyay no single devel package now
-#Requires: %{name}-devel = %{epoch}:%{version}-%{release}
+#Requires: %{name}-devel = %{version}-%{release}
%description examples
Example programs bundled with Qt version.
@@ -827,9 +829,8 @@
OPTFLAGS="%{rpmcflags}"
PATH=$QTDIR/bin:$PATH
QMAKESPEC=$QTDIR/mkspecs/linux-g++
-YACC='byacc -d'
-export QTDIR YACC PATH LD_LIBRARY_PATH QMAKESPEC OPTFLAGS
+export QTDIR PATH LD_LIBRARY_PATH QMAKESPEC OPTFLAGS
##################################
# DEFAULT OPTIONS FOR ALL BUILDS #
@@ -1357,6 +1358,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.61 2006/01/25 18:16:25 qboosh
+- no epoch in internal deps (Epoch not defined)
+- (f)lex and (b)yacc are not used during build
+- QtGui depends on Qt3Support and QtSql (because of some plugins)
+
Revision 1.60 2006/01/24 07:41:05 glen
- add epoches
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.60&r2=1.61&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
