This commit is contained in:
Than Ngo 2008-09-21 22:17:00 +00:00
parent 95443e61d5
commit 1be86990b9
3 changed files with 12 additions and 8 deletions

View File

@ -2,3 +2,5 @@ hi128-app-qt4-logo.png
hi48-app-qt4-logo.png
qt-x11-opensource-src-4.4.1.tar.bz2
qt-copy-patches-20080908svn.tar.bz2
qt-x11-opensource-src-4.4.2.tar.bz2
qt-copy-patches-20080920svn.tar.bz2

14
qt.spec
View File

@ -8,8 +8,8 @@ Epoch: 1
%else
Name: qt4
%endif
Version: 4.4.1
Release: 3%{?dist}
Version: 4.4.2
Release: 1%{?dist}
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
License: GPLv3 with exceptions or GPLv2 with exceptions
@ -41,7 +41,7 @@ Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
Patch10: qt-x11-opensource-src-4.4.1-systray.patch
## qt-copy patches
%define qt_copy 20080908
%define qt_copy 20080920
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}}
@ -270,10 +270,9 @@ Qt libraries which are used for drawing widgets and OpenGL items.
%setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2}
%if 0%{?qt_copy:1}
# Mac(?)-specific, doesn't apply
echo "0242" >> patches/DISABLED
# already(?) applied to 4.4.1
echo "0244" >> patches/DISABLED
echo "0250" >> patches/DISABLED
echo "0251" >> patches/DISABLED
test -x apply_patches && ./apply_patches
%endif
@ -734,6 +733,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%changelog
* Sat Sep 20 2008 Than Ngo <than@redhat.com> 4.4.2-1
- 4.4.2
* Mon Sep 08 2008 Rex Dieter <rdieter@fedoraproject.org> - 4.4.1-3
- apply QMAKEPATH portion of multilib patch only if needed
- qt-copy-patches-20080908

View File

@ -1,4 +1,4 @@
d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
a94a6f5ef01598bb9980891f2515ff45 qt-x11-opensource-src-4.4.1.tar.bz2
ab07c997ab770a4b2c5f8838b7fb4a0e qt-copy-patches-20080908svn.tar.bz2
200faca22f861cd09f108df9924f195c qt-x11-opensource-src-4.4.2.tar.bz2
d77a7d864375b44b3e9dd3afa53017fa qt-copy-patches-20080920svn.tar.bz2