rpms/qt4/FC-5 qt-x11-opensource-src-4.3.0-qassistant-qt4.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 assistant.desktop, 1.3, 1.4 designer.desktop, 1.2, 1.3 linguist.desktop, 1.2, 1.3 qconfig-multilib.h, 1.1, 1.2 qt4.spec, 1.28, 1.29 qtconfig.desktop, 1.3, 1.4 qtdemo.desktop, 1.2, 1.3 sources, 1.9, 1.10 0154-qdbuscpp2xml-moc_path.diff, 1.1, NONE qt-x11-opensource-src-4.1.2-assistant4.patch, 1.2, NONE utf8-bug-qt4-2.diff, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Jun 22 13:18:56 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16012
Modified Files:
.cvsignore assistant.desktop designer.desktop linguist.desktop
qconfig-multilib.h qt4.spec qtconfig.desktop qtdemo.desktop
sources
Added Files:
qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
Removed Files:
0154-qdbuscpp2xml-moc_path.diff
qt-x11-opensource-src-4.1.2-assistant4.patch
utf8-bug-qt4-2.diff
Log Message:
* Wed May 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-1
- qt-4.3.0(final)
qt-x11-opensource-src-4.3.0-qassistant-qt4.patch:
--- NEW FILE qt-x11-opensource-src-4.3.0-qassistant-qt4.patch ---
--- qt-x11-opensource-src-4.3.0beta/tools/assistant/lib/qassistantclient.cpp.assistant4 2007-03-19 15:15:06.000000000 -0500
+++ qt-x11-opensource-src-4.3.0beta/tools/assistant/lib/qassistantclient.cpp 2007-03-21 14:02:59.000000000 -0500
@@ -172,7 +172,7 @@
: QObject( parent ), host ( QLatin1String("localhost") )
{
if ( path.isEmpty() )
- assistantCommand = QLatin1String("assistant");
+ assistantCommand = QLatin1String("assistant-qt4");
else {
QFileInfo fi( path );
if ( fi.isDir() )
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 25 Apr 2007 15:16:12 -0000 1.13
+++ .cvsignore 22 Jun 2007 13:18:20 -0000 1.14
@@ -1,2 +1,2 @@
clog
-qt-x11-opensource-src-4.2.3.tar.gz
+qt-x11-opensource-src-4.3.0.tar.gz
Index: assistant.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/FC-5/assistant.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- assistant.desktop 5 Jul 2006 11:38:23 -0000 1.3
+++ assistant.desktop 22 Jun 2007 13:18:20 -0000 1.4
@@ -6,4 +6,4 @@
Terminal=false
Encoding=UTF-8
Type=Application
-Categories=Qt;Application;Development;
+Categories=Qt;Development;Documentation;
Index: designer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/FC-5/designer.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- designer.desktop 5 Jul 2006 11:38:23 -0000 1.2
+++ designer.desktop 22 Jun 2007 13:18:20 -0000 1.3
@@ -8,4 +8,4 @@
Terminal=false
Encoding=UTF-8
Type=Application
-Categories=Qt;Application;Development;
+Categories=Qt;Development;
Index: linguist.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/FC-5/linguist.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linguist.desktop 5 Jul 2006 11:38:23 -0000 1.2
+++ linguist.desktop 22 Jun 2007 13:18:20 -0000 1.3
@@ -7,4 +7,4 @@
Terminal=false
Encoding=UTF-8
Type=Application
-Categories=Qt;Application;Development;
+Categories=Qt;Development;
Index: qconfig-multilib.h
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/FC-5/qconfig-multilib.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qconfig-multilib.h 15 Mar 2007 18:42:59 -0000 1.1
+++ qconfig-multilib.h 22 Jun 2007 13:18:20 -0000 1.2
@@ -1,18 +1,27 @@
/* qconfig.h */
-/* hack for multilib'ing */
+/* This file is here to prevent a file conflict on multiarch systems. A
+ * conflict will occur because qconfig.h has arch-specific definitions.
+ *
+ * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
#if defined(__x86_64__)
# include <QtCore/qconfig-x86_64.h>
#elif defined(__i386__)
# include <QtCore/qconfig-i386.h>
-#elif defined(__ppc64__) || defined(__powerpc64__)
+#elif defined(__powerpc64__)
# include <QtCore/qconfig-ppc64.h>
-#elif defined(__ppc__) || defined(__powerpc__)
+#elif defined(__powerpc__)
# include <QtCore/qconfig-ppc.h>
+#elif defined(__s390x__)
+# include <QtCore/qconfig-s390x.h>
+#elif defined(__s390__)
+# include <QtCore/qconfig-s390.h>
#elif defined(__sparc64__)
# include <QtCore/qconfig-sparc64.h>
#elif defined(__sparc__)
# include <QtCore/qconfig-sparc.h>
#else
-# error arch unsupported, see bugzilla.redhat.com/223663
+/* Should never reach this point, if so see bugzilla.redhat.com/223663 */
+#error "This qt4-devel package does not work your architecture?"
#endif
+
Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- qt4.spec 25 Apr 2007 15:37:34 -0000 1.28
+++ qt4.spec 22 Jun 2007 13:18:20 -0000 1.29
@@ -4,41 +4,36 @@
#define beta rc1
#define preview -preview
-#define rel %{beta}
-#define snap 20060927
-#define beta snapshot-%{snap}
-#define rel %{snap}
+#define snap 20070423
+#define beta snapshot%{snap}
Summary: Qt toolkit
Name: qt4
-Version: 4.2.3
-Release: 8%{?dist}
+Version: 4.3.0
+Release: 1%{?dist}
License: GPL
Group: System Environment/Libraries
Url: http://www.trolltech.com/products/qt/
%if "%{?snap:1}" == "1"
-Source0: ftp://ftp.trolltech.com/qt/snapshots/qt-x11-opensource-src-%{version}%{?beta:-%{beta}}.tar.bz2
+Source0: ftp://ftp.trolltech.com/qt/snapshots/qt-x11-opensource-src-%{version}-%{snap}.tar.bz2
%else
-Source0: ftp://ftp.trolltech.com/qt/source/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}.tar.gz
+Source0: ftp://ftp.trolltech.com/qt/source/qt-x11%{?preview}-opensource-src-%{version}%{?beta}.tar.gz
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source1: Trolltech.conf
# See http://bugzilla.redhat.com/223663
-ExclusiveArch: %{ix86} x86_64 ppc ppc64 sparc sparc64
+%define multilib_arches x86_64 i386 ppc64 ppc s390 s390x sparc64 sparc
Source5: qconfig-multilib.h
# search for assistant-qt4 instead of (qt3's) assistant in $PATH
-Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch
+Patch1: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
# multilib hacks
Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
-# CVE-2007-0242
-Patch3: utf8-bug-qt4-2.diff
## qt-copy patches
-Patch0154: 0154-qdbuscpp2xml-moc_path.diff
Source10: qt4-wrapper.sh
Source11: qt4.sh
@@ -95,10 +90,12 @@
BuildRequires: libjpeg-devel
BuildRequires: libmng-devel
BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
BuildRequires: libungif-devel
BuildRequires: freetype-devel
BuildRequires: zlib-devel
BuildRequires: glib2-devel
+BuildRequires: openssl-devel
## In theory, should be as simple as:
#define x_deps libGL-devel libGLU-devel
@@ -126,7 +123,7 @@
%endif
%if "%{?sqlite:1}" != "-no-sql-sqlite"
-%if 0%{?fedora} > 2
+%if 0%{?fedora} > 2
%define _system_sqlite -system-sqlite
BuildRequires: sqlite-devel
%endif
@@ -134,6 +131,8 @@
Obsoletes: %{name}-config < %{version}-%{release}
Provides: %{name}-config = %{version}-%{release}
+## libQtScript Obsoletes libqsa ?
+# Obsoletes: qt4-qsa
%description
Qt is a software toolkit for developing applications.
@@ -165,9 +164,6 @@
Group: Documentation
Requires: %{name} = %{version}-%{release}
Provides: %{name}-assistant = %{version}-%{release}
-# For docs -> doc rename, temporary, since it was a short-lived subpkg
-#Obsoletes: %{name}-docs < %{version}-%{release}
-#Provides: %{name}-docs = %{version}-%{release}
%description doc
%{summary}. Includes:
Qt Assistant, Qt Demo
@@ -217,13 +213,15 @@
%prep
+%if "%{?snap:1}" == "1"
+%setup -q -n qt-x11%{?preview}-opensource-src-%{version}-%{snap}
+%else
%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta}
+%endif
%patch1 -p1 -b .assistant4
# don't use -b on mkspec files, else they get installed too.
%patch2 -p1
-%patch3 -p0 -b .utf8-bug
-%patch0154 -p0 -b .qt-copy#0154
# drop -fexceptions from $RPM_OPT_FLAGS
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -263,11 +261,6 @@
%build
-# There's a bug in the qdbus build somewhere, but we'll hack around it here for now -- Rex
-%if "%{?qdbus}" == "-qdbus"
-LD_RUN_PATH=$(pwd)/lib;export LD_RUN_PATH
-%endif
-
# build shared, threaded (default) libraries
echo yes | ./configure -v \
-prefix %{qt4_prefix} \
@@ -294,6 +287,7 @@
-system-libmng \
-system-libpng \
-system-libjpeg \
+ -system-libtiff \
-system-zlib \
-tablet \
-xcursor \
@@ -304,6 +298,7 @@
-xrender \
-xkb \
-glib \
+ -openssl \
%{?qdbus} %{!?qdbus:-no-qdbus} \
%{?nas} %{!?nas:-no-nas-sound} \
%{?mysql} \
@@ -332,21 +327,18 @@
for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz \
-L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}/lib ; do
sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/lib*.la ||:
- sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.pc
+ sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/pkgconfig/*.pc
sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.prl
done
# riskier
for dep in -lXrender -lXrandr -lXcursor -lXfixes -lXinerama -lXi -lXft -lXt -lXext -lX11 -lSM -lICE -ldl -lpthread ; do
sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/lib*.la ||:
- sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.pc
+ sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/pkgconfig/*.pc
sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.prl
done
# nuke dandling reference(s) to %buildroot
sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qt4_libdir}/*.prl
-mkdir -p %{buildroot}%{_libdir}/pkgconfig/
-mv %{buildroot}%{qt4_libdir}/*.pc %{buildroot}%{_libdir}/pkgconfig/
-
# -doc make symbolic link to qt4_docdir
rm -rf %{buildroot}%{qtdir}/doc
ln -s ../../share/doc/qt %{buildroot}%{qtdir}/doc
@@ -386,11 +378,13 @@
# .la files, die, die, die.
rm -f %{buildroot}%{qt4_libdir}/lib*.la
+%ifarch %{multilib_archs}
## multilib: qconfig
mv %{buildroot}%{qt4_headerdir}/Qt/qconfig.h %{buildroot}%{qt4_headerdir}/QtCore/qconfig-%{_arch}.h
install -p -m644 -D %{SOURCE5} %{buildroot}%{qt4_headerdir}/QtCore/qconfig-multilib.h
ln -sf qconfig-multilib.h %{buildroot}%{qt4_headerdir}/QtCore/qconfig.h
ln -sf ../QtCore/qconfig.h %{buildroot}%{qt4_headerdir}/Qt/qconfig.h
+%endif
## multilib: mkspecs
%if "%{qt4_datadir}" != "%{qt4_prefix}"
@@ -448,6 +442,7 @@
%{qt4_libdir}/libQtDBus.so.*
%endif
%{qt4_libdir}/libQtNetwork.so.*
+%{qt4_libdir}/libQtScript.so.*
%{qt4_libdir}/libQtSql.so.*
%{qt4_libdir}/libQtTest.so.*
%{qt4_libdir}/libQtXml.so.*
@@ -560,7 +555,24 @@
%changelog
-* Tue Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-8
+* Wed May 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-1
+- qt-4.3.0(final)
+
+* Fri May 04 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.0-0.5.rc1
+- update to 4.3.0 RC1
+- drop LD_RUN_PATH hack
+
+* Fri May 04 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.0-0.3.snapshot20070423
+- update to qt-4.3.0-snapshot-20070423
+- build with SSL support (BR openssl-devel)
+- drop upstreamed mysql_config.patch
+
+* Wed May 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-0.2.beta
+- qt-4.3.0beta
+- -system-libtiff, BR: libtiff-devel
+
+* Wed May 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-8
+- QFileDialog file wrapping patch (qt#153635, rh#236908)
- License: GPL, dropping LICENSE.QPL (#237702)
* Thu Mar 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-7
Index: qtconfig.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/FC-5/qtconfig.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qtconfig.desktop 11 Oct 2006 19:19:15 -0000 1.3
+++ qtconfig.desktop 22 Jun 2007 13:18:20 -0000 1.4
@@ -5,4 +5,4 @@
Terminal=false
Encoding=UTF-8
Type=Application
-Categories=Qt;Application;AdvancedSettings;Settings;
+Categories=Qt;Settings;
Index: qtdemo.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/FC-5/qtdemo.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtdemo.desktop 5 Jul 2006 11:38:23 -0000 1.2
+++ qtdemo.desktop 22 Jun 2007 13:18:20 -0000 1.3
@@ -5,4 +5,4 @@
Terminal=false
Encoding=UTF-8
Type=Application
-Categories=Qt;Application;Development;
+Categories=Qt;Development;
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 15 Mar 2007 18:42:59 -0000 1.9
+++ sources 22 Jun 2007 13:18:20 -0000 1.10
@@ -1 +1 @@
-13f12bf58a32ebf15837fcd605cb3c99 qt-x11-opensource-src-4.2.3.tar.gz
+8012acea71b35c18247bd92c4721589d qt-x11-opensource-src-4.3.0.tar.gz
--- 0154-qdbuscpp2xml-moc_path.diff DELETED ---
--- qt-x11-opensource-src-4.1.2-assistant4.patch DELETED ---
--- utf8-bug-qt4-2.diff DELETED ---
More information about the fedora-extras-commits
mailing list