Enable third party apps to detect their correct build parameters according to what libqt was build with ticket #219

qt/qt.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        XWindow
 License:      GPL
 Version:      3.2.0
-Release:      20030729
+Release:      20030806
 
 #   package options
 %option       with_pgsql    no
@@ -45,8 +45,8 @@ Source0:      ftp://ftp.trolltech.com/pub/qt/source/qt-x11-free-%{version}.tar.b
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103, X11, gcc
+BuildPreReq:  OpenPKG, openpkg >= 20030103, X11, pkgconfig, gcc
-PreReq:       OpenPKG, openpkg >= 20030103, X11
+PreReq:       OpenPKG, openpkg >= 20030103, X11, pkgconfig
 %if "%{with_pgsql}" == "yes"
 BuildPreReq:  postgresql
 PreReq:       postgresql
@@ -97,6 +97,12 @@ AutoReqProv:  no
     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 @@ AutoReqProv:  no
         -prefix %{l_prefix} \
         -docdir %{l_prefix}/share/qt/doc \
         -datadir %{l_prefix}/share/qt/data \
-        -release -static -stl -sm -qt-zlib \
+        -release -static -stl -sm \
-        -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
+        -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 @@ AutoReqProv:  no
         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 @@ AutoReqProv:  no
         -prefix %{l_prefix} \
         -docdir %{l_prefix}/share/qt/doc \
         -datadir %{l_prefix}/share/qt/data \
-        -release -static -stl -sm -qt-zlib \
+        -release -static -stl -sm \
-        -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
+        -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 @@ AutoReqProv:  no
     #   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 @@ AutoReqProv:  no
         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 \