diff --git a/.cvsignore b/.cvsignore index c2d0d20..b1b35b5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -qt-x11-free-3.3.2.tar.bz2 +qt-x11-free-3.3.3.tar.bz2 diff --git a/qt-x11-free-3.3.3-qembed.patch b/qt-x11-free-3.3.3-qembed.patch new file mode 100644 index 0000000..2edf959 --- /dev/null +++ b/qt-x11-free-3.3.3-qembed.patch @@ -0,0 +1,20 @@ +--- qt-x11-free-3.3.3/tools/tools.pro.qembed 2004-06-08 10:05:03.000000000 +0200 ++++ qt-x11-free-3.3.3/tools/tools.pro 2004-08-11 15:47:35.393118498 +0200 +@@ -5,6 +5,7 @@ + SUBDIRS = assistant/lib \ + designer \ + assistant \ ++ qembed \ + linguist + unix:SUBDIRS += qtconfig + } +--- qt-x11-free-3.3.3/tools/qembed/qembed.pro.qembed 2004-06-08 10:08:40.000000000 +0200 ++++ qt-x11-free-3.3.3/tools/qembed/qembed.pro 2004-08-11 15:51:12.008859486 +0200 +@@ -2,3 +2,7 @@ + SOURCES = qembed.cpp + TARGET = qembed + REQUIRES=full-config nocrosscompiler ++DESTDIR = ../../bin ++target.path=$$bins.path ++INSTALLS += target ++ diff --git a/qt.spec b/qt.spec index 8042f7e..8554d58 100644 --- a/qt.spec +++ b/qt.spec @@ -6,7 +6,7 @@ %define immodule 1 -%define ver 3.3.2 +%define ver 3.3.3 %define qt_dirname qt-3.3 %define qtdir %{_libdir}/%{qt_dirname} @@ -73,7 +73,7 @@ Summary: The shared library for the Qt GUI toolkit. Name: qt Version: %{ver} -Release: 10 +Release: 1 Epoch: 1 License: GPL/QPL Group: System Environment/Libraries @@ -89,14 +89,13 @@ Patch4: qt-x11-free-3.3.1-mono.patch Patch5: qt-x11-free-3.3.0-strip.patch Patch6: qt-x11-free-3.3.0-freetype.patch Patch7: qt-x11-free-3.3.2-quiet.patch -Patch8: qt-x11-free-3.3.2-qembed.patch +Patch8: qt-x11-free-3.3.3-qembed.patch Patch10: qt-x11-free-3.3.1-lib64.patch -Patch11: qt-x11-free-3.3.2-misc.patch Patch12: qt-uic-nostdlib.patch Patch13: qt-x11-free-3.3.1-qfontdatabase_x11.patch # feature patches -Patch50: qt-x11-immodule-bc-qt3.3.2-20040623.diff +Patch50: qt-x11-immodule-bc-qt3.3.3.patch Prefix: %{qtdir} @@ -285,7 +284,6 @@ for the Qt toolkit. %patch7 -p1 -b .quiet %patch8 -p1 -b .qembed %patch10 -p1 -%patch11 -p1 -b .misc %patch12 -p1 -b .nostdlib %patch13 -p1 -b .fonts @@ -693,6 +691,9 @@ rm -rf %{buildroot} %changelog +* Wed Aug 11 2004 Than Ngo 1:3.3.3-1 +- update to 3.3.3 release + * Thu Jul 01 2004 Than Ngo 1:3.3.2-10 - add immodule for Qt diff --git a/sources b/sources index c9affa1..c9c63f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -903cad618274ad84d7d13fd0027a6c3c qt-x11-free-3.3.2.tar.bz2 +3e0a0c8429b0a974b39b5f535ddff01c qt-x11-free-3.3.3.tar.bz2