Hello community, here is the log from the commit of package qt3 checked in at Fri Feb 9 01:18:20 CET 2007. -------- --- KDE/qt3/qt3.changes 2007-02-02 15:41:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/qt3/qt3.changes 2007-02-07 10:39:22.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Feb 7 10:39:13 CET 2007 - dmueller@suse.de + +- also build qt3-static as full-config + +------------------------------------------------------------------- +Mon Feb 5 15:18:34 CET 2007 - stbinner@suse.de + +- fix build of qt3-extensions on 9.3 + +------------------------------------------------------------------- qt3-devel-doc.changes: same change qt3-extensions.changes: same change qt3-static.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.Ol2420/_old 2007-02-09 01:14:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Ol2420/_new 2007-02-09 01:14:53.000000000 +0100 @@ -18,7 +18,7 @@ Summary: Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.7 -Release: 25 +Release: 27 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -233,6 +233,10 @@ /usr/share/pixmaps/assistant3.png %changelog -n qt3-devel-doc +* Wed Feb 07 2007 - dmueller@suse.de +- also build qt3-static as full-config +* Mon Feb 05 2007 - stbinner@suse.de +- fix build of qt3-extensions on 9.3 * Fri Feb 02 2007 - stbinner@suse.de - fix changelog chronological order * Wed Jan 31 2007 - dmueller@suse.de ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.Ol2420/_old 2007-02-09 01:14:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Ol2420/_new 2007-02-09 01:14:53.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: cups-devel krb5-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files License: GNU General Public License (GPL), THE Q PUBLIC LICENSE (QPL) Version: 3.3.7 -Release: 26 +Release: 28 Autoreqprov: on Requires: qt3 = %version Group: Development/Tools/Other @@ -477,6 +477,10 @@ %{_mandir}/man*/* %changelog -n qt3-extensions +* Wed Feb 07 2007 - dmueller@suse.de +- also build qt3-static as full-config +* Mon Feb 05 2007 - stbinner@suse.de +- fix build of qt3-extensions on 9.3 * Fri Feb 02 2007 - stbinner@suse.de - fix changelog chronological order * Wed Jan 31 2007 - dmueller@suse.de ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.Ol2420/_old 2007-02-09 01:14:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Ol2420/_new 2007-02-09 01:14:53.000000000 +0100 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: A library for developing applications with graphical user interfaces Version: 3.3.7 -Release: 25 +Release: 27 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- @@ -373,6 +373,10 @@ /etc/profile.d/qt3.* %changelog -n qt3 +* Wed Feb 07 2007 - dmueller@suse.de +- also build qt3-static as full-config +* Mon Feb 05 2007 - stbinner@suse.de +- fix build of qt3-extensions on 9.3 * Fri Feb 02 2007 - stbinner@suse.de - fix changelog chronological order * Wed Jan 31 2007 - dmueller@suse.de ++++++ qt3-static.spec ++++++ --- /var/tmp/diff_new_pack.Ol2420/_old 2007-02-09 01:14:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Ol2420/_new 2007-02-09 01:14:53.000000000 +0100 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: static program library for developing applications with graphical user interfaces Version: 3.3.7 -Release: 26 +Release: 27 %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN @@ -201,29 +201,12 @@ source %{SOURCE1} install -d ${RPM_BUILD_ROOT}/usr/lib/qt3/%_lib/ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -# -# call configure from build_script.sh for non-threaded Qt library -# -export QTDIR=`pwd` -call_configure -no-thread -static -qt-imgfmt-jpeg -system-libpng -qt-libmng -L%_libdir $OPTIONS -make sub-src %{?jobs:-j%jobs} -install -m 0644 lib/libqt.a \ - ${RPM_BUILD_ROOT}/usr/lib/qt3/%_lib/libqt.a -make distclean call_configure -thread -static -system-libpng -L%_libdir $OPTIONS make sub-src %{?jobs:-j%jobs} -install -m 0644 lib/libqt-mt.a \ - ${RPM_BUILD_ROOT}/usr/lib/qt3/%_lib/libqt-mt.a -make distclean -#echo yes|./configure -platform $PLATFORM -static \ -# -system-libpng -no-g++-exceptions -no-xft -no-xrender \ -# -disable-opengl -no-xinerama -no-sm -L%_libdir -#make sub-src %{?jobs:-j%jobs} %install -#install -m 0755 lib/libqt.a \ -# ${RPM_BUILD_ROOT}/usr/lib/qt3/%_lib/libqt-mini.a -#install -d -m 0755 ${RPM_BUILD_ROOT}/%_libdir +install -m 0644 lib/libqt-mt.a \ + ${RPM_BUILD_ROOT}/usr/lib/qt3/%_lib/libqt-mt.a %clean rm -rf $RPM_BUILD_ROOT @@ -237,11 +220,13 @@ %defattr(-,root,root) %dir /usr/lib/qt3 %dir /usr/lib/qt3/%{_lib} -/usr/lib/qt3/%{_lib}/libqt.a /usr/lib/qt3/%{_lib}/libqt-mt.a -#/usr/lib/qt3/%{_lib}/libqt-mini.a %changelog -n qt3-static +* Wed Feb 07 2007 - dmueller@suse.de +- also build qt3-static as full-config +* Mon Feb 05 2007 - stbinner@suse.de +- fix build of qt3-extensions on 9.3 * Fri Feb 02 2007 - stbinner@suse.de - fix changelog chronological order * Wed Jan 31 2007 - dmueller@suse.de ++++++ build_script.sh ++++++ --- KDE/qt3/build_script.sh 2007-01-31 21:04:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/qt3/build_script.sh 2007-02-06 22:47:39.000000000 +0100 @@ -13,6 +13,14 @@ function call_configure { EXTRA_OPTIONS=$@ + OPENGL="-dlopen-opengl" + case $EXTRA_OPTIONS in + *-static*) + OPENGL="-no-dlopen-opengl" + ;; + *) + ;; + esac [ "$WLIB" == "lib64" ] && PLATFORM=linux-g++-64 || PLATFORM=linux-g++ LARGEFILE="-largefile" @@ -22,13 +30,7 @@ [ -e /usr/X11R6/include/X11/extensions/XInput.h ] && TABLET="-tablet" || TABLET="" PGSQL="-plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server" ODBC="-plugin-sql-odbc" - [ "$VERSION" -gt 900 ] && SQLITE="-plugin-sql-sqlite" || SQLITE="" -# export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -O0 -g" - # workaround, to be removed later, yes, it is not nice - [ "$VERSION" -lt 901 ] && [ "$HOSTTYPE" == "ppc64" ] && export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" - [ "$HOSTTYPE" == "hppa" -o "$HOSTTYPE" == "parisc" ] && export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -ffunction-sections" -# [ "$HOSTTYPE" == "x86_64" ] && export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-if-conversion " if [ -f /.buildenv ] && grep -q BUILD_BASENAME=beta- /.buildenv ; then export NO_BRP_STRIP_DEBUG=true export DEBUG="-debug" @@ -63,11 +65,11 @@ OPTIONS="-platform $PLATFORM -qt-gif -stl $DEBUG \ -system-zlib -system-libjpeg -system-libpng \ -plugin-imgfmt-jpeg -inputmethod \ - -nis -cups -ipv6 -dlopen-opengl \ + -nis -cups -ipv6 $OPENGL \ -xkb $LIBMNG -no-g++-exceptions $LARGEFILE $XCURSOR \ $XFT $XINERAMA -sm -L/usr/$WLIB -L/usr/X11R6/$WLIB \ -plugin-sql-mysql -I/usr/include/mysql/ \ - $TABLET $ORACLE $PGSQL $ODBC $SQLITE $NEWABI \ + $TABLET $ORACLE $PGSQL $ODBC -plugin-sql-sqlite $NEWABI \ -prefix $PREFIX -libdir $PREFIX/$WLIB" # use styles as plugins, beside platinum. leave windowsxp disabled ++++++ pre_checkin.sh ++++++ --- KDE/qt3/pre_checkin.sh 2006-07-09 23:34:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/qt3/pre_checkin.sh 2007-02-07 10:28:50.000000000 +0100 @@ -1,9 +1,9 @@ #!/bin/bash # This script is called automatically during autobuild checkin. -cp qt3.changes qt3-static.changes -cp qt3.changes qt3-extensions.changes -cp qt3.changes qt3-devel-doc.changes +cp -l qt3.changes qt3-static.changes +cp -l qt3.changes qt3-extensions.changes +cp -l qt3.changes qt3-devel-doc.changes for spec in qt3-extensions.spec qt3-static.spec qt3-devel-doc.spec; do { sed -n -e '1,/COMMON-BEGIN/p' $spec.in ++++++ qt3-static.spec.in ++++++ --- KDE/qt3/qt3-static.spec.in 2006-10-20 15:53:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/qt3/qt3-static.spec.in 2007-02-06 22:37:16.000000000 +0100 @@ -23,29 +23,12 @@ install -d ${RPM_BUILD_ROOT}/usr/lib/qt3/%_lib/ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -# -# call configure from build_script.sh for non-threaded Qt library -# -export QTDIR=`pwd` -call_configure -no-thread -static -qt-imgfmt-jpeg -system-libpng -qt-libmng -L%_libdir $OPTIONS -make sub-src %{?jobs:-j%jobs} -install -m 0644 lib/libqt.a \ - ${RPM_BUILD_ROOT}/usr/lib/qt3/%_lib/libqt.a -make distclean call_configure -thread -static -system-libpng -L%_libdir $OPTIONS make sub-src %{?jobs:-j%jobs} -install -m 0644 lib/libqt-mt.a \ - ${RPM_BUILD_ROOT}/usr/lib/qt3/%_lib/libqt-mt.a -make distclean -#echo yes|./configure -platform $PLATFORM -static \ -# -system-libpng -no-g++-exceptions -no-xft -no-xrender \ -# -disable-opengl -no-xinerama -no-sm -L%_libdir -#make sub-src %{?jobs:-j%jobs} %install -#install -m 0755 lib/libqt.a \ -# ${RPM_BUILD_ROOT}/usr/lib/qt3/%_lib/libqt-mini.a -#install -d -m 0755 ${RPM_BUILD_ROOT}/%_libdir +install -m 0644 lib/libqt-mt.a \ + ${RPM_BUILD_ROOT}/usr/lib/qt3/%_lib/libqt-mt.a %clean rm -rf $RPM_BUILD_ROOT @@ -59,8 +42,6 @@ %defattr(-,root,root) %dir /usr/lib/qt3 %dir /usr/lib/qt3/%{_lib} -/usr/lib/qt3/%{_lib}/libqt.a /usr/lib/qt3/%{_lib}/libqt-mt.a -#/usr/lib/qt3/%{_lib}/libqt-mini.a %changelog -n qt3-static ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org