2:19 p.m.
Author: rdieter
Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19031
Modified Files:
.cvsignore qt4.spec qtconfig.desktop sources
Log Message:
* Wed Oct 04 2006 Rex Dieter 4.2.0-1
- 4.2.0(final)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 28 Aug 2006 12:16:49 -0000 1.6
+++ .cvsignore 11 Oct 2006 19:19:15 -0000 1.7
@@ -1,5 +1,4 @@
clog
-qt41.spec
+OLD/
qt-x11-opensource-src-4.1.4.tar.gz
-qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
-qt-x11-opensource-src-4.2.0-snapshot-20060821.tar.bz2
+qt-x11-opensource-src-4.2.0.tar.gz
Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qt4.spec 28 Aug 2006 13:38:15 -0000 1.17
+++ qt4.spec 11 Oct 2006 19:19:15 -0000 1.18
@@ -2,15 +2,27 @@
# Fedora Review
# http://bugzilla.redhat.com/188180
+#define beta rc1
+#define preview -preview
+#define rel %{beta}
+
+#define snap 20060927
+#define beta snapshot-%{snap}
+#define rel %{snap}
+
Summary: Qt toolkit
Name: qt4
-Version: 4.1.4
-Release: 11%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
License: GPL/QPL
Group: System Environment/Libraries
Url: http://www.trolltech.com/products/qt/
-Source0: ftp://ftp.troll.no/qt/source/qt-x11-opensource-src-%{version}.tar.gz
+%if "%{?snap:1}" == "1"
+Source0:
ftp://ftp.trolltech.com/qt/snapshots/qt-x11-opensource-src-%{version}%{?b...
+%else
+Source0:
ftp://ftp.trolltech.com/qt/source/qt-x11%{?preview}-opensource-src-%{vers...
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# search for assistant-qt4 instead of (qt3's) assistant in $PATH
@@ -27,27 +39,24 @@
## optional plugin bits
# set to -no-sql-<driver> to disable
# set to -qt-sql-<driver> to enable *in* qt library
-%define mysql -no-sql-mysql
-%if "%{?fedora}" > "3" || "%{?rhel}" > "3"
+#if "%{?fedora}" > "3" || "%{?rhel}" > "3"
%define mysql -plugin-sql-mysql
-%endif
+#endif
%define odbc -plugin-sql-odbc
%define psql -plugin-sql-psql
%define sqlite -plugin-sql-sqlite
-#
-%if "%{?fedora}" > "4"
-%define nas -system-nas-sound
-%endif
-%if "%{?fedora}" == "4"
-# nas unavailable on fc4/x86_64
-%ifnarch x86_64
+
+# undefine to disable these
%define nas -system-nas-sound
-%endif
+# watch http://bugzilla.redhat.com/207923 so we may be able to include this on FC-5
someday
+%if "%{?fedora}" > "5"
+%define qdbus -qdbus
+BuildRequires: dbus-devel >= 0.62
%endif
%define qt_dirname %{name}
%define qtdir %{_libdir}/%{qt_dirname}
-# See bug #196901
+# See http://bugzilla.redhat.com/196901
%define qt_datadir %{_datadir}/%{qt_dirname}
%define qt_docdir %{_docdir}/%{qt_dirname}
%define qt_headerdir %{_includedir}
@@ -73,10 +82,11 @@
BuildRequires: libungif-devel
BuildRequires: freetype-devel
BuildRequires: zlib-devel
+BuildRequires: glib2-devel
%define x_deps libGL-devel libGLU-devel
%if "%{?fedora}" > "4"
-%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXft-devel
libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel
xorg-x11-proto-devel libGL-devel libGLU-devel
+%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel
libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel
libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
%endif
BuildRequires: %{x_deps}
@@ -106,6 +116,8 @@
#BuildRequires: sqlite-devel
%endif
+BuildConflicts: qt4-devel
+
Obsoletes: %{name}-config < %{version}-%{release}
Provides: %{name}-config = %{version}-%{release}
@@ -190,16 +202,19 @@
%prep
-%setup -q -n qt-x11-opensource-src-%{version}
+%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}
%patch1 -p1 -b .assistant4
# drop -fexceptions from $RPM_OPT_FLAGS
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
-# add -fno-strict-aliasing, for now
-%if "%{?fedora}" > "4"
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%endif
+
+## Looks like we don't need this anymore -- Rex
+# add -fno-strict-aliasing, for now (fc6+)
+#if "%{?fedora}" > "5"
+#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+#endif
+
# use $RPM_OPT_FLAGS for our platform
%if "%{_lib}" == "lib64"
%define platform linux-g++-64
@@ -207,10 +222,11 @@
%define platform linux-g++
%endif
sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" mkspecs/%{platform}/qmake.conf
+sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" mkspecs/common/*.conf ||:
# undefine QMAKE_STRIP, so we get useful -debuginfo pkgs
sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP =|"
mkspecs/linux-g++*/qmake.conf
-#sed -i -e "s|= strip$|= |g" mkspecs/linux-g++*/qmake.conf
+sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP =|"
mkspecs/common/*.conf ||:
# set correct lib path
if [ "%{_lib}" == "lib64" ] ; then
@@ -221,6 +237,11 @@
%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 %{qtdir} \
@@ -240,6 +261,7 @@
-qt-gif \
-no-reduce-exports \
-no-rpath \
+ -no-separate-debug-info \
-sm \
-stl \
-system-libmng \
@@ -248,15 +270,18 @@
-system-zlib \
-tablet \
-xcursor \
+ -xfixes \
-xinerama \
-xshape \
-xrandr \
-xrender \
-xkb \
+ -glib \
+ %{?qdbus} %{!?qdbus:-no-qdbus} \
%{?nas} %{!?nas:-no-nas-sound} \
- %{?mysql} %{?mysql_include} %{?mysql_ldflags} \
- %{?psql} \
- %{?odbc} \
+ %{?mysql} %{?mysql_include} %{?mysql_ldflags} \
+ %{?psql} \
+ %{?odbc} \
%{?sqlite}
make %{?_smp_mflags}
@@ -277,7 +302,7 @@
## pkg-config
# strip extraneous dirs/libraries -- Rex
# safe ones
-for dep in -laudio -lglib-2.0 -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} \
+for dep in -laudio -ldbus-1 -lglib-2.0 -lmng -ljpeg -lpng -lz -lfreetype -lm
%{?mysql_ldflags} \
-L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}/lib ; do
sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||:
sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc
@@ -306,13 +331,13 @@
mkdir -p %{buildroot}%{_bindir}
pushd %{buildroot}%{qtdir}/bin
for i in *; do
- case "$i" in
+ case "${i}" in
assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
- LINK=${i}-qt4
+ LINK="${i}-qt4"
+ ln -s "${i}" "%{buildroot}%{qtdir}/bin/${LINK}"
;;
*)
- LINK=${i}
- ln -s $i %{buildroot}%{qtdir}/bin/${LINK}
+ LINK="${i}"
;;
esac
install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
@@ -349,7 +374,7 @@
%files
%defattr(-,root,root,-)
-%doc README* changes*
+%doc README*
%{!?beta:%doc OPENSOURCE-NOTICE.TXT}
%{qtdir}/LICENSE.*
%if "%{qt_libdir}" != "%{_libdir}"
@@ -360,6 +385,9 @@
%dir %{qtdir}/bin/
%dir %{qt_datadir}
%{qt_libdir}/libQtCore.so.*
+%if "%{?qdbus}" == "-qdbus"
+%{qt_libdir}/libQtDBus.so.*
+%endif
%{qt_libdir}/libQtNetwork.so.*
%{qt_libdir}/libQtSql.so.*
%{qt_libdir}/libQtTest.so.*
@@ -374,9 +402,12 @@
%{qt_libdir}/libQtGui.so.*
%{qt_libdir}/libQtOpenGL.so.*
%{qt_libdir}/libQtSvg.so.*
-%{qtdir}/plugins/accessible/
-%{qtdir}/plugins/imageformats/
-%{qtdir}/plugins/inputmethods/
+%if "%{version}" >= "4.2.0"
+%{qt_libdir}/libQtAssistantClient.so.*
+%endif
+%{qtdir}/plugins/*
+%exclude %{qtdir}/plugins/designer
+%exclude %{qtdir}/plugins/sqldrivers
#-config bits
%{qtdir}/bin/qt*config*
%{_bindir}/qt*config*
@@ -391,12 +422,18 @@
%{qtdir}/bin/qm2ts*
%{_bindir}/qm2ts*
%endif
+%if "%{?qdbus}" == "-qdbus"
+%{qtdir}/bin/qdbus*
+%{_bindir}/qdbus*
+%endif
+%{qtdir}/bin/pixeltool*
%{qtdir}/bin/qmake*
%{qtdir}/bin/qt3to4
%{qtdir}/bin/rcc*
%{qtdir}/bin/uic*
%{_bindir}/lrelease*
%{_bindir}/lupdate*
+%{_bindir}/pixeltool*
%{_bindir}/moc*
%{_bindir}/qmake*
%{_bindir}/qt3to4
@@ -412,7 +449,7 @@
%{qt_libdir}/libQtDesigner.so.*
%{qt_libdir}/libQtDesignerComponents.so.*
%{qt_libdir}/libQt*.so
-# 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a
+# remaining static lib: libQtUiTools.a
%{qt_libdir}/libQt*.a
%{qt_libdir}/libQt*.prl
%{_libdir}/pkgconfig/*.pc
@@ -469,23 +506,45 @@
%changelog
-* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-11
-- backout xfixes mod(s), only applicable to 4.2 branch
-- cleanup bindir renames
+* Wed Oct 04 2006 Rex Dieter 4.2.0-1
+- 4.2.0(final)
-* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-9
-- ./configure -xfixes, BR: libXfixes-devel
+* Thu Sep 28 2006 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 4.2.0-0.9.20060927
+- update to 4.2.0-snapshot-20060927
+- update QDBus executable names
+- -x11: exclude plugins/designer (which belong to -devel)
+- BuildConflicts: qt4-devel
+- drop -fno-strict-aliasing hack (fc5+)
+
+* Wed Sep 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.8.rc1
+- qtconfig.desktop: Categories=+AdvancedSettings;Settings
+
+* Fri Sep 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.7.rc1
+- 4.2.0-rc1
+
+* Fri Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.6.20060821
+- update to 4.2.0-snapshot-20060821 (same as today's qt-copy)
+- -no-separate-debug-info
+- - ./configure -xfixes, BR: libXfixes-devel
+
+* Mon Aug 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.5.tp1
+- fix empty -debuginfo
+- use $RPM_OPT_FLAGS
-* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-8
-- strip -laudio, -lglib-2.0 from .pc files
+* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.4.tp1
+- strip -laudio, -ldbus-1, -lglib-2.0 from .pc files
-* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-7
+* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.3.tp1
- -no-reduce-exports (for now)
- -fno-strict-aliasing (fc5+)
-* Thu Jul 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-6
-- make buildable on legacy releases
-- -system-nas-sound (bug #197937)
+* Fri Jul 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.2.tp1
+- -system-nas-sound, BR: nas-devel (bug # 197937)
+- -qdbus (fc6+, BR: dbus-devel >= 0.62)
+- -glib (BR: glib2-devel)
+
+* Fri Jun 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.1.tp1
+- 4.2.0-tp1 (technology preview 1)
* Thu Jun 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-5
- make FHS-friendly (bug #196901)
Index: qtconfig.desktop
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qtconfig.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qtconfig.desktop 5 Jul 2006 11:38:23 -0000 1.2
+++ qtconfig.desktop 11 Oct 2006 19:19:15 -0000 1.3
@@ -5,4 +5,4 @@
Terminal=false
Encoding=UTF-8
Type=Application
-Categories=Qt;Application;Development;
+Categories=Qt;Application;AdvancedSettings;Settings;
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 28 Aug 2006 12:16:49 -0000 1.4
+++ sources 11 Oct 2006 19:19:15 -0000 1.5
@@ -1,2 +1 @@
-88f8c9c4622108baca2950baac3c02d6 qt-x11-opensource-src-4.1.4.tar.gz
-099a99d1b72b4be752fe0e211bc32dcf qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
+2c062a125d5ca66397e3430ba537fbec qt-x11-opensource-src-4.2.0.tar.gz