rpms/qt4/F-8 .cvsignore, 1.23, 1.24 qt4.spec, 1.76, 1.77 sources, 1.19, 1.20 qt-43-aliasing.diff, 1.1, NONE qt-x11-opensource-src-4.3.4-aliasing.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Jun 4 17:47:26 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/qt4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18138
Modified Files:
.cvsignore qt4.spec sources
Removed Files:
qt-43-aliasing.diff qt-x11-opensource-src-4.3.4-aliasing.patch
Log Message:
* Wed May 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.5-1
- qt-x11-opensource-src-4.3.5
- qt-copy 20080528 patches
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-8/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 16 Apr 2008 15:54:29 -0000 1.23
+++ .cvsignore 4 Jun 2008 17:46:16 -0000 1.24
@@ -2,3 +2,5 @@
hi48-app-qt4-logo.png
qt-copy-patches-20080305svn.tar.bz2
qt-x11-opensource-src-4.3.4.tar.gz
+qt-copy-patches-20080528svn.tar.bz2
+qt-x11-opensource-src-4.3.5.tar.gz
Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-8/qt4.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- qt4.spec 19 May 2008 14:38:13 -0000 1.76
+++ qt4.spec 4 Jun 2008 17:46:16 -0000 1.77
@@ -7,8 +7,8 @@
%else
Name: qt4
%endif
-Version: 4.3.4
-Release: 14%{?dist}
+Version: 4.3.5
+Release: 1%{?dist}
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
License: GPLv3 or GPLv2 with exceptions or QPL
@@ -33,9 +33,6 @@
Patch1: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
# multilib hacks
Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
-# strict aliasing violations in tool classes
-Patch3: qt-43-aliasing.diff
-Patch4: qt-x11-opensource-src-4.3.4-aliasing.patch
Patch5: qt-x11-opensource-src-4.3.4-as_IN-437440.patch
# look for OpenSSL using versioned sonames
Patch6: qt-x11-opensource-src-4.3.4-openssl.patch
@@ -45,7 +42,7 @@
Patch8: qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch
## qt-copy patches
-%define qt_copy 20080305
+%define qt_copy 20080528
Source1: qt-copy-patches-svn_checkout.sh
Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2
%{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -274,20 +271,15 @@
%endif
%if 0%{?qt_copy:1}
-# 204,206,208 don't apply atm, some/most of these are already included -- Rex
-echo "0204" >> patches/DISABLED
-echo "0206" >> patches/DISABLED
-echo "0208" >> patches/DISABLED
+# dome don't apply atm, some/most of these are already included -- Rex
+echo "0176" >> patches/DISABLED
test -x apply_patches && ./apply_patches
-%else
-%patch3 -p0
%endif
%patch1 -p1 -b .assistant4
# don't use -b on mkspec files, else they get installed too.
%patch2 -p1
-%patch4 -p1
%patch5 -p1 -b .bz#437440-as_IN-437440
%patch6 -p1 -b .openssl
# SHLIB_VERSION_NUMBER is wrong on F8 and older
@@ -712,6 +704,10 @@
%changelog
+* Wed May 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.5-1
+- qt-x11-opensource-src-4.3.5
+- qt-copy 20080528 patches
+
* Mon May 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.4-14
- don't hardcode incorrect font substitutions (#447298)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-8/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 16 Apr 2008 15:54:29 -0000 1.19
+++ sources 4 Jun 2008 17:46:16 -0000 1.20
@@ -1,4 +1,4 @@
d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
-e07759e773b8ec38ce222b6fd5e9f0c5 qt-copy-patches-20080305svn.tar.bz2
-9499101ec54eb7b0de195b3c5e3ffa93 qt-x11-opensource-src-4.3.4.tar.gz
+c12c234097d65943603a624ea989bca5 qt-copy-patches-20080528svn.tar.bz2
+4e6234235431e768e18777ff32990cc2 qt-x11-opensource-src-4.3.5.tar.gz
--- qt-43-aliasing.diff DELETED ---
--- qt-x11-opensource-src-4.3.4-aliasing.patch DELETED ---
More information about the scm-commits
mailing list