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: 06-Aug-2003 08:49:17
Branch: HEAD Handle: 2003080607491501
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Enable third party apps to detect their correct build parameters
according to what libqt was build with ticket #219
Summary:
Revision Changes Path
1.73 +22 -8 openpkg-src/qt/qt.spec
1.6047 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
============================================================================
$ cvs diff -u -r1.72 -r1.73 qt.spec
--- openpkg-src/qt/qt.spec 29 Jul 2003 14:23:22 -0000 1.72
+++ openpkg-src/qt/qt.spec 6 Aug 2003 06:49:16 -0000 1.73
@@ -33,7 +33,7 @@
Group: XWindow
License: GPL
Version: 3.2.0
-Release: 20030729
+Release: 20030806
# package options
%option with_pgsql no
@@ -45,8 +45,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, X11, gcc
-PreReq: OpenPKG, openpkg >= 20030103, X11
+BuildPreReq: OpenPKG, openpkg >= 20030103, X11, pkgconfig, gcc
+PreReq: OpenPKG, openpkg >= 20030103, X11, pkgconfig
%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql
PreReq: postgresql
@@ -97,6 +97,12 @@
esac
# special trolltech configuration
+ CC="%{l_cc}" \
+ CXX="%{l_cxx}" \
+ CFLAGS="%{l_cflags -O}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
echo "yes" | ./configure \
%if "%{with_pgsql}" == "yes"
-qt-sql-psql \
@@ -108,8 +114,8 @@
-prefix %{l_prefix} \
-docdir %{l_prefix}/share/qt/doc \
-datadir %{l_prefix}/share/qt/data \
- -release -static -stl -sm -qt-zlib \
- -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
+ -release -static -stl -sm \
+ -qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-no-nis -no-cups -no-nas-sound -no-xinerama \
-no-xrender -no-xft -no-tablet -no-xkb \
-no-thread
@@ -121,6 +127,12 @@
symlinks src-qmake src-moc sub-src sub-tools
# run configure a second time to get threaded libs as well
+ CC="%{l_cc}" \
+ CXX="%{l_cxx}" \
+ CFLAGS="%{l_cflags -O}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
echo "yes" | ./configure \
%if "%{with_pgsql}" == "yes"
-qt-sql-psql \
@@ -132,8 +144,8 @@
-prefix %{l_prefix} \
-docdir %{l_prefix}/share/qt/doc \
-datadir %{l_prefix}/share/qt/data \
- -release -static -stl -sm -qt-zlib \
- -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
+ -release -static -stl -sm \
+ -qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-no-nis -no-cups -no-nas-sound -no-xinerama \
-no-xrender -no-xft -no-tablet -no-xkb \
-thread
@@ -149,7 +161,7 @@
# make directory structure
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/lib \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig \
$RPM_BUILD_ROOT%{l_prefix}/include/qt/private \
$RPM_BUILD_ROOT%{l_prefix}/man/man1 \
$RPM_BUILD_ROOT%{l_prefix}/man/man3 \
@@ -188,6 +200,8 @@
tools/designer/designer/images/* $RPM_BUILD_ROOT%{l_prefix}/share/qt/images/
%{l_shtool} install -c -m 644 \
lib/*.a lib/*.prl $RPM_BUILD_ROOT%{l_prefix}/lib/
+ %{l_shtool} install -c -m 644 \
+ lib/qt.pc $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
%{l_shtool} install -c -m 644 \
doc/man/man3/*.3 $RPM_BUILD_ROOT%{l_prefix}/man/man3/
%{l_shtool} install -c -m 644 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6046 -r1.6047 news.txt
--- openpkg-web/news.txt 5 Aug 2003 18:58:05 -0000 1.6046
+++ openpkg-web/news.txt 6 Aug 2003 06:49:15 -0000 1.6047
@@ -1,3 +1,4 @@
+06-Aug-2003: Upgraded package: P<qt-3.2.0-20030806>
05-Aug-2003: Upgraded package: P<wine-msov-20030805-20030805>
05-Aug-2003: Upgraded package: P<pgadmin-0.8.0.20030805-20030805>
05-Aug-2003: Upgraded package: P<ruby-1.8.0-20030805>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
