rpms
/
qt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

first crack at 4.6.0-rc1

This commit is contained in:
Rex Dieter 2009-11-17 18:41:21 +00:00
parent 711f1678b4
commit 65ccedb1ad
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -7,4 +7,4 @@ hi22-phonon-gstreamer.png
hi32-phonon-gstreamer.png
hi48-phonon-gstreamer.png
hi64-phonon-gstreamer.png
qt-everywhere-opensource-src-4.6.0-beta1.tar.gz
qt-everywhere-opensource-src-4.6.0-rc1.tar.gz

5
kde-qt-patches.sh
View File

@ -1,7 +1,6 @@
# quick-n-dirty method to fetch patches from -patched git branch
# unfortunately, requires an already checked-out copy of the git repo
# when switching branches, use something like: git checkout --track -b remotes/origin/4.6.0-beta1-patched
git format-patch --output-directory kde-qt-patches v4.6.0-beta1..origin/4.6.0-beta1-patched
#git format-patch --output-directory kde-qt-patches v4.6.0-beta1..origin/4.6-stable-patched
# when switching branches, use something like: git checkout --track -b remotes/origin/4.6-stable-patched
git format-patch --output-directory kde-qt-patches v4.6.0-beta1..origin/4.6-stable-patched

13
qt.spec
View File

@ -6,7 +6,7 @@
%define _default_patch_fuzz 3
%define pre beta1
%define pre rc1
# enable kde-qt integration/patches (currently a no-op)
%define kde_qt 1
@ -14,7 +14,7 @@ Summary: Qt toolkit
Name: qt
Epoch: 1
Version: 4.6.0
Release: 0.5.%{pre}%{?dist}
Release: 0.6.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -428,10 +428,10 @@ Qt libraries used for drawing widgets and OpenGL items.
## needs manual love
#patch208 -p1 -b .kde-qt-0008
#patch209 -p1 -b .kde-qt-0009
%patch274 -p1 -b .qt-copy-0274
## already applied?
#patch274 -p1 -b .qt-copy-0274
## already applied
#patch210 -p1 -b .kde-qt-0010
%patch211 -p1 -b .kde-qt-0011
#patch211 -p1 -b .kde-qt-0011
%patch212 -p1 -b .kde-qt-0012
#patch213 -p1 -b .kde-qt-0013
@ -1018,6 +1018,9 @@ fi
%changelog
* Tue Nov 17 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.6.0-0.6.rc1
- qt-4.6.0-rc1
* Sat Nov 14 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.6.0-0.5.beta1
- -tds: Add package with TDS sqldriver (#537586)
- add arch'd provides for sql drivers

2
sources
View File

@ -7,4 +7,4 @@ d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
12db12c009b722a6dc141f78feb7e330 hi32-phonon-gstreamer.png
86c34a1b81d44980b1381f94ed6b7a23 hi48-phonon-gstreamer.png
153505c71ec021b0a3bd4b74f2492e93 hi64-phonon-gstreamer.png
60d136f17491ce0e56bb317ea7300aef qt-everywhere-opensource-src-4.6.0-beta1.tar.gz
56772a3f9128f00504d2b21dbe4186b3 qt-everywhere-opensource-src-4.6.0-rc1.tar.gz