|
|
@@ -1,6 +1,6 @@
|
|
|
%define type x11
|
|
|
%define qtdir %{_libdir}/qt-%{version}
|
|
|
-%define rel 10
|
|
|
+%define rel 11
|
|
|
%define buildstatic 1
|
|
|
%define buildnonthread 0
|
|
|
%define styleplugins 0
|
|
|
@@ -33,6 +33,7 @@ Patch102: qt3-CVE-2007-4137.diff
|
|
|
# Patches 200-299 are from fedora core
|
|
|
Patch200: qt-uic-nostdlib.patch
|
|
|
Patch201: qt-x11-free-3.3.5-gcc4-buildkey.patch
|
|
|
+Patch238: qt-x11-free-3.3.8-odbc.patch
|
|
|
# Patches 300-399 are from kde.gr.jp
|
|
|
# Patches for immodule for Qt
|
|
|
Patch500: qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch
|
|
|
@@ -246,6 +247,7 @@ toolkit.
|
|
|
%patch102 -p0 -b .CVE-2007-4137
|
|
|
%patch200 -p1 -b .nostdlib
|
|
|
%patch201 -p1 -b .gcc4-buildkey
|
|
|
+%patch238 -p1 -b .odbc
|
|
|
|
|
|
%if %{immodule}
|
|
|
%patch500 -p1 -b .pre
|
|
|
@@ -743,6 +745,9 @@ fi
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Apr 12 2011 IWAI, Masaharu <iwai@alib.jp> 3.3.8-11
|
|
|
+- add new unixODBC patch (Patch238) from Fedora qt3-3.3.8b-35
|
|
|
+
|
|
|
* Sat Apr 9 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.3.8-10
|
|
|
- rebuilt with unixODBC-2.2.14 and cups-1.4.6
|
|
|
|
iwaim