OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 26-Feb-2003 17:07:48
Branch: HEAD Handle: 2003022616074601
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Make even fatter (but more flexible) by installing plain libraries as
well as multithreaded ones
Summary:
Revision Changes Path
1.59 +20 -3 openpkg-src/qt/qt.spec
1.3462 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
============================================================================
$ cvs diff -u -r1.58 -r1.59 qt.spec
--- openpkg-src/qt/qt.spec 19 Feb 2003 13:24:14 -0000 1.58
+++ openpkg-src/qt/qt.spec 26 Feb 2003 16:07:47 -0000 1.59
@@ -33,7 +33,7 @@
Group: XWindow
License: GPL
Version: 3.1.1
-Release: 20030218
+Release: 20030226
# package options
%option with_xft no
@@ -87,7 +87,7 @@
-docdir %{l_prefix}/share/qt/doc \
-datadir %{l_prefix}/share/qt/data \
-static -qt-gif -qt-zlib -platform $oscomp \
- -thread -stl -qt-libpng -qt-libjpeg -qt-libmng \
+ -stl -qt-libpng -qt-libjpeg -qt-libmng \
%if "%{with_xft}" == "yes"
-xft
%else
@@ -97,6 +97,23 @@
# set $HOME to a writable directory for qsettings
HOME=$PWD
%{l_make} %{l_mflags -O} \
+ MAKE="%{l_make} %{l_mflags -O}"
+
+ # run configure a second time to get threaded libs, too
+ echo "yes" | ./configure \
+ -prefix %{l_prefix} \
+ -docdir %{l_prefix}/share/qt/doc \
+ -datadir %{l_prefix}/share/qt/data \
+ -static -qt-gif -qt-zlib -platform $oscomp \
+ -thread -stl -qt-libpng -qt-libjpeg -qt-libmng \
+%if "%{with_xft}" == "yes"
+ -xft
+%else
+ -no-xft
+%endif
+
+ # make our targets a second time to get threaded libs, too
+ %{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
symlinks src-qmake src-moc sub-src sub-tools
@@ -115,7 +132,7 @@
$RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks \
$RPM_BUILD_ROOT%{l_prefix}/share/qt/images
- # copy binaries, headers, and then libraries to their target.
+ # copy binaries, headers, and then libraries to their target
%{l_shtool} install -c -s -m 755 \
bin/qmake bin/moc bin/uic \
bin/linguist bin/lrelease bin/lupdate \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3461 -r1.3462 news.txt
--- openpkg-web/news.txt 26 Feb 2003 13:59:48 -0000 1.3461
+++ openpkg-web/news.txt 26 Feb 2003 16:07:46 -0000 1.3462
@@ -1,3 +1,4 @@
+26-Feb-2003: Upgraded package: P<qt-3.1.1-20030226>
26-Feb-2003: Upgraded package: P<qpopper-4.0.4-20030226>
26-Feb-2003: New package: P<lyx-1.3.0-20030226>
26-Feb-2003: Upgraded package: P<calc-2.11.7-20030126>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
