rpms/qt4/FC-5 .cvsignore, 1.8, 1.9 qt4.spec, 1.19, 1.20 sources, 1.6, 1.7
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Oct 23 23:08:46 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5129
Modified Files:
.cvsignore qt4.spec sources
Log Message:
* Mon Oct 23 2006 Rex Dieter 4.2.1-2
- use repun upstream 4.2.1 tarball
- fix pre-modular-X libGL/libGLU deps (#211898)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 23 Oct 2006 02:52:05 -0000 1.8
+++ .cvsignore 23 Oct 2006 23:07:46 -0000 1.9
@@ -1,5 +1,6 @@
clog
OLD/
qt-x11-opensource-src-4.1.4.tar.gz
+qt-x11-opensource-src-4.1.5.tar.gz
qt-x11-opensource-src-4.2.0.tar.gz
qt-x11-opensource-src-4.2.1.tar.gz
Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qt4.spec 23 Oct 2006 02:52:05 -0000 1.19
+++ qt4.spec 23 Oct 2006 23:07:46 -0000 1.20
@@ -13,7 +13,7 @@
Summary: Qt toolkit
Name: qt4
Version: 4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL/QPL
Group: System Environment/Libraries
@@ -84,11 +84,14 @@
BuildRequires: zlib-devel
BuildRequires: glib2-devel
-%define x_deps libGL-devel libGLU-devel
-%if "%{?fedora}" > "4"
+## In theory, should be as simple as:
+#define x_deps libGL-devel libGLU-devel
+## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898
+%define x_deps xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
%endif
-BuildRequires: %{x_deps}
+BuildRequires: %{x_deps} %{?x_deps_GL_hack}
%if "%{?nas}" == "-system-nas-sound"
BuildRequires: nas-devel
@@ -149,7 +152,7 @@
Summary: API documentation, demos and example programs for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
-Provides: %{name}-assistant = %{version}_%{release}
+Provides: %{name}-assistant = %{version}-%{release}
# For docs -> doc rename, temporary, since it was a short-lived subpkg
#Obsoletes: %{name}-docs < %{version}-%{release}
#Provides: %{name}-docs = %{version}-%{release}
@@ -506,6 +509,13 @@
%changelog
+* Mon Oct 23 2006 Rex Dieter 4.2.1-2
+- use repun upstream 4.2.1 tarball
+- fix pre-modular-X libGL/libGLU deps (#211898)
+
+* Sun Oct 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.1-1
+- 4.2.1
+
* Wed Oct 04 2006 Rex Dieter 4.2.0-1
- 4.2.0(final)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 23 Oct 2006 02:52:05 -0000 1.6
+++ sources 23 Oct 2006 23:07:46 -0000 1.7
@@ -1 +1 @@
-6be04af6cdfc7f22e606fbcefd367eb7 qt-x11-opensource-src-4.2.1.tar.gz
+2ab1c88084f55b94809f025a8503bf18 qt-x11-opensource-src-4.2.1.tar.gz
More information about the scm-commits
mailing list