SPECS: qt.spec, qt4.spec - add epoches

[glen]

Author: glen                         Date: Tue Jan 24 07:38:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add epoches

---- Files affected:
SPECS:
   qt.spec (1.349 -> 1.350) , qt4.spec (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: SPECS/qt.spec
diff -u SPECS/qt.spec:1.349 SPECS/qt.spec:1.350
--- SPECS/qt.spec:1.349	Sat Jan 21 01:01:17 2006
+++ SPECS/qt.spec	Tue Jan 24 08:38:45 2006
@@ -69,11 +69,11 @@
 %{?with_nvidia:BuildRequires:	X11-driver-nvidia-devel >= 1.0.6111-2}
 %{?with_cups:BuildRequires:	cups-devel}
 BuildRequires:	flex
-BuildRequires:	freetype-devel >= 2.0.0
+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}
@@ -90,7 +90,7 @@
 BuildRequires:	xrender-devel
 BuildRequires:	zlib-devel
 Requires:	OpenGL
-Requires:	freetype >= 2.0.0
+Requires:	freetype >= 1:2.0.0
 #Requires:	libjpeg
 Requires:	libmng >= 1.0.0
 #Requires:	libpng
@@ -176,7 +176,7 @@
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	OpenGL-devel
-Requires:	freetype-devel >= 2.0.0
+Requires:	freetype-devel >= 1:2.0.0
 Requires:	libjpeg-devel
 Requires:	libmng-devel >= 1.0.0
 Requires:	libpng-devel
@@ -595,8 +595,8 @@
 Summary:	Qt documentation browser
 Summary(pl):	Przeglądarka dokumentacji Qt
 Group:		X11/Development/Tools
-Requires:	%{name}-doc
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name}-doc
 Conflicts:	qt-devel < 6:3.3.2-3
 
 %description assistant
@@ -1258,6 +1258,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.350  2006/01/24 07:38:45  glen
+- add epoches
+
 Revision 1.349  2006/01/21 00:01:17  arekm
 - kill Icon: field (support for these is obsolete says jbj)
 

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.58 SPECS/qt4.spec:1.59
--- SPECS/qt4.spec:1.58	Tue Jan 24 02:00:14 2006
+++ SPECS/qt4.spec	Tue Jan 24 08:38:45 2006
@@ -68,11 +68,11 @@
 BuildRequires:	byacc
 %{?with_cups:BuildRequires:	cups-devel}
 BuildRequires:	flex
-BuildRequires:	freetype-devel >= 2.0.0
+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}
@@ -264,9 +264,9 @@
 Summary:	OpenGL support classes - development files
 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:	OpenGL-devel
 
 %description -n QtOpenGL-devel
 OpenGL support classes - development files.
@@ -1357,6 +1357,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2006/01/24 07:38:45  glen
+- add epoches
+
 Revision 1.58  2006/01/24 01:00:14  charles
 - added more Rs to {QtCore,QtGui,QtOpenGL}-devel
 - s/qmake/qt4-qmake/
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qt.spec?r1=1.349&r2=1.350&f=u
    http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.58&r2=1.59&f=u