OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 22-Oct-2002 09:17:35
Branch: HEAD Handle: 2002102208173401
Modified files:
openpkg-src/qt qt.spec readme.txt
openpkg-web news.txt
Log:
Fixed makefile copying and added mkspecs directory for portable qmake building.
Summary:
Revision Changes Path
1.41 +6 -2 openpkg-src/qt/qt.spec
1.4 +6 -0 openpkg-src/qt/readme.txt
1.1847 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/qt/qt.spec
============================================================
$ cvs diff -u -r1.40 -r1.41 qt.spec
--- openpkg-src/qt/qt.spec 14 Oct 2002 21:41:16 -0000 1.40
+++ openpkg-src/qt/qt.spec 22 Oct 2002 07:17:35 -0000 1.41
@@ -33,7 +33,7 @@
Group: XWindow
License: GPL
Version: 3.0.5
-Release: 20021014
+Release: 20021022
# list of sources
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
@@ -41,7 +41,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, gcc, X11
+BuildPreReq: OpenPKG, openpkg >= 20020206, X11, gcc
PreReq: OpenPKG, openpkg >= 20020206, X11
AutoReq: no
AutoReqProv: no
@@ -97,6 +97,7 @@
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/lib \
$RPM_BUILD_ROOT%{l_prefix}/include/qt/private \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
$RPM_BUILD_ROOT%{l_prefix}/man/man3 \
$RPM_BUILD_ROOT%{l_prefix}/share/qt/doc/html \
$RPM_BUILD_ROOT%{l_prefix}/share/qt/templates
@@ -107,6 +108,9 @@
bin/linguist bin/lrelease bin/lupdate \
bin/assistant bin/qtconfig bin/designer \
$RPM_BUILD_ROOT%{l_prefix}/bin/
+
+ # copy mkspecs directory for later portable use of qmake
+ cp -rp mkspecs $RPM_BUILD_ROOT%{l_prefix}/share/qt/
# qt_windows.h is the only header not copied in the original distribution.
rm -f include/qt_windows.h
Index: openpkg-src/qt/readme.txt
============================================================
$ cvs diff -u -r1.3 -r1.4 readme.txt
--- openpkg-src/qt/readme.txt 14 Oct 2002 18:09:58 -0000 1.3
+++ openpkg-src/qt/readme.txt 22 Oct 2002 07:17:35 -0000 1.4
@@ -19,6 +19,12 @@
Fragen:
Is there a way to tell Qt where to find the freetype includes and libraries during
configuration buildtime?
+Fragen:
+ Why doesn't DESTDIR work?
+Antwort:
+ Qt uses $INSTALL_ROOT instead, but isn't recursively passed to subsequent
+ make calls so is relatively useless in a spec file.
+
-------- First problem building with -system-libpng
$ rpm --rebuild qt-3.0.4-20020610.src.rpm
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1846 -r1.1847 news.txt
--- openpkg-web/news.txt 21 Oct 2002 19:34:30 -0000 1.1846
+++ openpkg-web/news.txt 22 Oct 2002 07:17:34 -0000 1.1847
@@ -1,3 +1,4 @@
+22-Oct-2002: Upgraded package: P<qt-3.0.5-20021022>
21-Oct-2002: Upgraded package: P<flex-2.5.4a-20021021>
21-Oct-2002: Upgraded package: P<fsl-1.0.5-20021021>
21-Oct-2002: Upgraded package: P<fsl-1.0.4-20021021>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]