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: 14-Oct-2002 20:09:59
Branch: HEAD Handle: 2002101419095701
Modified files:
openpkg-src/qt qt.spec readme.txt
openpkg-web news.txt
Log:
Resolved a FIXME, fixed a datadir problem, and added manpage substitution logic.
Summary:
Revision Changes Path
1.39 +7 -5 openpkg-src/qt/qt.spec
1.3 +3 -0 openpkg-src/qt/readme.txt
1.1773 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/qt/qt.spec
============================================================
$ cvs diff -u -r1.38 -r1.39 qt.spec
--- openpkg-src/qt/qt.spec 11 Oct 2002 20:22:03 -0000 1.38
+++ openpkg-src/qt/qt.spec 14 Oct 2002 18:09:58 -0000 1.39
@@ -33,7 +33,7 @@
Group: XWindow
License: GPL
Version: 3.0.5
-Release: 20021011
+Release: 20021014
# list of sources
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
@@ -73,7 +73,6 @@
echo "yes" | ./configure \
-prefix %{l_prefix} -release \
-docdir %{l_prefix}/share/qt/doc \
- -datadir %{l_prefix}/share/qt/data \
-release -static -qt-gif -qt-zlib \
-static -qt-gif -qt-zlib \
-platform $oscomp -thread -stl \
@@ -82,11 +81,14 @@
-no-xft -sm -xinerama -xrender \
-L`%{l_prefix}/etc/rc --query x11_libdir` \
-R`%{l_prefix}/etc/rc --query x11_libdir`
+
+ # Save and resotore $HOME from its default of l_prefix
+ SAVE_HOME=$HOME;HOME=$PWD
%{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
symlinks src-qmake src-moc sub-src sub-tools
+ HOME=$SAVE_HOME;unset SAVE_HOME
# FIXME: "-Wl,-rpath,/tmp/qt-x11-free-3.0.4/lib"
- # FIXME: "QSettings: error creating /cw/.qt"
%install
rm -rf $RPM_BUILD_ROOT
@@ -98,8 +100,7 @@
$RPM_BUILD_ROOT%{l_prefix}/include/qt/private \
$RPM_BUILD_ROOT%{l_prefix}/man/man3 \
$RPM_BUILD_ROOT%{l_prefix}/share/qt/doc/html \
- $RPM_BUILD_ROOT%{l_prefix}/share/qt/templates \
- $RPM_BUILD_ROOT%{l_prefix}/share/qt/data
+ $RPM_BUILD_ROOT%{l_prefix}/share/qt/templates
# copy binaries, headers, and then libraries to their target.
%{l_shtool} install -c -s -m 755 \
@@ -122,6 +123,7 @@
( cd $RPM_BUILD_ROOT%{l_prefix}/lib && tar xf - )
( cd doc/man/man3
for man in *.3qt; do
+ %{l_shtool} subst -e 's;\.3qt;.3;' $man
mv $man `echo $man | sed -e 's;\.3qt$;.3;'`
done
%{l_shtool} install -c -m 644 \
Index: openpkg-src/qt/readme.txt
============================================================
$ cvs diff -u -r1.2 -r1.3 readme.txt
--- openpkg-src/qt/readme.txt 27 Sep 2002 13:59:05 -0000 1.2
+++ openpkg-src/qt/readme.txt 14 Oct 2002 18:09:58 -0000 1.3
@@ -16,6 +16,9 @@
- Michael Schloh von Bennewitz
+Fragen:
+Is there a way to tell Qt where to find the freetype includes and libraries during
configuration buildtime?
+
-------- First problem building with -system-libpng
$ rpm --rebuild qt-3.0.4-20020610.src.rpm
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1772 -r1.1773 news.txt
--- openpkg-web/news.txt 14 Oct 2002 18:03:28 -0000 1.1772
+++ openpkg-web/news.txt 14 Oct 2002 18:09:57 -0000 1.1773
@@ -1,3 +1,4 @@
+14-Oct-2002: Upgraded package: P<qt-3.0.5-20021014>
14-Oct-2002: Upgraded package: P<postfix-1.1.11-20021014>
13-Oct-2002: Upgraded package: P<grepmail-4.80-20021013>
13-Oct-2002: Upgraded package: P<ghostscript-7.04-20021013>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
