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-Nov-2002 15:01:15
Branch: HEAD Handle: 2002111414011103
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Integrate Trolltech's qt_windows fix, add new phrasebooks, and sort config
arguments.
Summary:
Revision Changes Path
1.47 +14 -14 openpkg-src/qt/qt.spec
1.2022 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/qt/qt.spec
============================================================
$ cvs diff -u -r1.46 -r1.47 qt.spec
--- openpkg-src/qt/qt.spec 13 Nov 2002 14:24:43 -0000 1.46
+++ openpkg-src/qt/qt.spec 14 Nov 2002 14:01:14 -0000 1.47
@@ -38,7 +38,7 @@
Group: XWindow
License: GPL
Version: 3.1.0
-Release: 20021113
+Release: 20021114
# list of sources
Source0: ftp://ftp.silug.org/pub/qt/source/qt-x11-free-%{version}.tar.gz
@@ -97,20 +97,18 @@
# special trolltech configuration
echo "yes" | ./configure \
- -prefix %{l_prefix} -release \
+ -prefix %{l_prefix} \
-docdir %{l_prefix}/share/qt/doc \
- -static -qt-gif -qt-zlib \
- -platform $oscomp -thread -stl \
- -qt-libpng -qt-libjpeg -qt-libmng \
- -no-nas-sound -no-tablet -no-xkb \
+ -datadir %{l_prefix}/share/qt/data \
+ -static -qt-gif -qt-zlib -platform $oscomp \
+ -L`%{l_prefix}/etc/rc --query x11_libdir` \
+ -R`%{l_prefix}/etc/rc --query x11_libdir` \
+ -thread -stl -qt-libpng -qt-libjpeg -qt-libmng \
%if "%{with_xft}" == "yes"
- -xft \
+ -xft
%else
- -no-xft \
+ -no-xft
%endif
- -sm -xinerama -xrender \
- -L`%{l_prefix}/etc/rc --query x11_libdir` \
- -R`%{l_prefix}/etc/rc --query x11_libdir`
# set $HOME to a writable directory for qsettings
HOME=$PWD
@@ -130,7 +128,8 @@
$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
+ $RPM_BUILD_ROOT%{l_prefix}/share/qt/templates \
+ $RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks
# copy binaries, headers, and then libraries to their target.
%{l_shtool} install -c -s -m 755 \
@@ -142,8 +141,6 @@
# 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
%{l_shtool} install -c -m 644 \
include/*.h $RPM_BUILD_ROOT%{l_prefix}/include/qt/
%{l_shtool} install -c -m 644 \
@@ -152,6 +149,9 @@
doc/html/* $RPM_BUILD_ROOT%{l_prefix}/share/qt/doc/html/
%{l_shtool} install -c -m 644 \
tools/designer/templates/*.ui $RPM_BUILD_ROOT%{l_prefix}/share/qt/templates/
+ %{l_shtool} install -c -m 644 \
+ tools/linguist/phrasebooks/*.qph
$RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks/
+
( cd lib && tar cf - * ) |\
( cd $RPM_BUILD_ROOT%{l_prefix}/lib && tar xf - )
( cd doc/man/man3
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.2021 -r1.2022 news.txt
--- openpkg-web/news.txt 14 Nov 2002 08:55:22 -0000 1.2021
+++ openpkg-web/news.txt 14 Nov 2002 14:01:11 -0000 1.2022
@@ -1,3 +1,4 @@
+14-Nov-2002: Upgraded package: P<qt-3.1.0-20021114>
14-Nov-2002: Upgraded package: P<xmame-0.61.1-20021114>
14-Nov-2002: Upgraded package: P<freetype-2.1.3-20021014>
14-Nov-2002: Upgraded package: P<imapd-2.1.10-20021114>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
