- track branches/qt-copy/4.4, and backout previous trunk(qt45) ones
This commit is contained in:
parent
bac96cf822
commit
a39b220c7b
@ -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-20090129svn.tar.bz2
|
||||
qt-copy-patches-20090205svn.tar.bz2
|
||||
|
@ -11,7 +11,7 @@ rm -rf $EXPORT_DIR
|
||||
SVN_ROOT=svn://anonsvn.kde.org/home/kde/branches/qt/4.4
|
||||
|
||||
svn export --non-recursive $SVN_ROOT $EXPORT_DIR/
|
||||
svn export $SVN_ROOT $EXPORT_DIR/patches
|
||||
svn export $SVN_ROOT/patches $EXPORT_DIR/patches
|
||||
|
||||
pushd $EXPORT_DIR
|
||||
rm -f ../qt-copy-patches-${DATE}svn.tar.bz2
|
||||
|
10
qt.spec
10
qt.spec
@ -9,7 +9,7 @@ Epoch: 1
|
||||
Name: qt4
|
||||
%endif
|
||||
Version: 4.4.3
|
||||
Release: 15%{?dist}
|
||||
Release: 16%{?dist}
|
||||
|
||||
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
|
||||
License: GPLv3 with exceptions or GPLv2 with exceptions
|
||||
@ -40,7 +40,7 @@ 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 20090129
|
||||
%define qt_copy 20090205
|
||||
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}}
|
||||
@ -274,9 +274,6 @@ Qt libraries which are used for drawing widgets and OpenGL items.
|
||||
echo "0242" >> patches/DISABLED
|
||||
echo "0250" >> patches/DISABLED
|
||||
echo "0251" >> patches/DISABLED
|
||||
echo "0269" >> patches/DISABLED
|
||||
echo "0270" >> patches/DISABLED
|
||||
echo "0271" >> patches/DISABLED
|
||||
|
||||
test -x apply_patches && ./apply_patches
|
||||
%endif
|
||||
@ -738,6 +735,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 05 2009 Rex Dieter <rdieter@fedoraproject.org> 4.4.3-16
|
||||
- track branches/qt-copy/4.4, and backout previous trunk(qt45) ones
|
||||
|
||||
* Mon Feb 02 2009 Than Ngo <than@redhat.com> 4.4.3-15
|
||||
- disable 0269,0270,0271 patches, it causes issue in systray
|
||||
|
||||
|
2
sources
2
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
|
||||
9c2c9930560dddd4713aa99af3a5199f qt-copy-patches-20090129svn.tar.bz2
|
||||
91aabde62e4b4884e686aac6b7b671f1 qt-copy-patches-20090205svn.tar.bz2
|
||||
|
Loading…
Reference in New Issue
Block a user