From 74e99e828021ca831af9c4324381b7ad4239ce3b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Nov 12 2008 14:34:33 +0000 Subject: - qt-copy-patches-20081112 --- diff --git a/.cvsignore b/.cvsignore index 9c57f66..d7f9c4b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ hi128-app-qt4-logo.png hi48-app-qt4-logo.png qt-x11-opensource-src-4.4.3.tar.bz2 -qt-copy-patches-20081110svn.tar.bz2 +qt-copy-patches-20081112svn.tar.bz2 diff --git a/qt.spec b/qt.spec index db978c5..b59c98a 100644 --- a/qt.spec +++ b/qt.spec @@ -9,7 +9,7 @@ Epoch: 1 Name: qt4 %endif Version: 4.4.3 -Release: 4%{?dist} +Release: 6%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 with exceptions or GPLv2 with exceptions @@ -41,12 +41,11 @@ Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch Patch10: qt-x11-opensource-src-4.4.3-im.patch ## qt-copy patches -%define qt_copy 20081110 +%define qt_copy 20081112 Source1: qt-copy-patches-svn_checkout.sh %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2} %{?qt_copy:Provides: qt-copy = %{qt_copy}} %{?qt_copy:Provides: qt4-copy = %{qt_copy}} -Patch100: 0256-fix-recursive-backingstore-sync-crash.diff Source11: qt4.sh Source12: qt4.csh @@ -275,8 +274,6 @@ echo "0242" >> patches/DISABLED echo "0250" >> patches/DISABLED echo "0251" >> patches/DISABLED test -x apply_patches && ./apply_patches -%else -%patch100 -p0 %endif # don't use -b on mkspec files, else they get installed too. @@ -736,8 +733,15 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog +* Wed Nov 12 2008 Rex Dieter 4.4.3-6 +- qt-copy-patches-20081112 + +* Tue Nov 11 2008 Than Ngo 4.4.3-5 +- drop 0256-fix-recursive-backingstore-sync-crash.diff, it's + included in qt-copy-pathes-20081110 + * Mon Nov 10 2008 Rex Dieter 4.4.3-4 -- qt-copy-pathes-20081110 +- qt-copy-patches-20081110 * Mon Nov 10 2008 Than Ngo 4.4.3-3 - apply 0256-fix-recursive-backingstore-sync-crash.diff diff --git a/sources b/sources index 557c18f..1d83b7a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png 6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png 00e00c6324d342a7b0d8653112b4f08c qt-x11-opensource-src-4.4.3.tar.bz2 -b41454ce508913f148d65014d8bff7fd qt-copy-patches-20081110svn.tar.bz2 +be046df48cad96664b6bab448d8ec420 qt-copy-patches-20081112svn.tar.bz2