rpms/qt/devel qt.spec, 1.235, 1.236 qt-x11-opensource-src-4.5.0-rc1-odbc.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Mon Feb 23 15:11:26 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24549
Modified Files:
qt.spec
Removed Files:
qt-x11-opensource-src-4.5.0-rc1-odbc.patch
Log Message:
revert odbc patch, already handled by 0273-odbc-64bit-compile.diff in qt-copy
Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- qt.spec 23 Feb 2009 13:28:39 -0000 1.235
+++ qt.spec 23 Feb 2009 15:10:55 -0000 1.236
@@ -12,7 +12,7 @@
Name: qt4
%endif
Version: 4.5.0
-Release: 0.6.rc1%{?dist}
+Release: 0.5.rc1%{?dist}
## for 4.5.0 final:
##License: LGPLv2 or GPLv3 with exceptions
@@ -46,7 +46,6 @@
Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
patch11: qt-x11-opensource-src-4.5.0-rc1-misc.patch
Patch12: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
-Patch13: qt-x11-opensource-src-4.5.0-rc1-odbc.patch
## upstreamable bits
# http://bugzilla.redhat.com/485677
@@ -316,7 +315,6 @@
%patch9 -p1 -b .qgtkstyle
%patch11 -p1 -b .misc
%patch12 -p1 -b .ppc64
-%patch13 -p1 -b .odbc
%patch50 -p1 -b .qhostaddress
@@ -783,9 +781,6 @@
%changelog
-* Mon Feb 23 2009 Than Ngo <than at redhat.com> 4.5.0-0.6.rc1
-- fix build problem against new unixODBC
-
* Sun Feb 22 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.0-0.5.rc1
- revert license, change won't land until official 4.5.0 release
- workaround broken qhostaddress.h (#485677)
--- qt-x11-opensource-src-4.5.0-rc1-odbc.patch DELETED ---
More information about the scm-commits
mailing list