Преглед изворни кода

Fixed makefile copying and added mkspecs directory for portable qmake building.

Michael Schloh von Bennewitz пре 23 година
родитељ
комит
488d99958a
2 измењених фајлова са 12 додато и 2 уклоњено
  1. 6 2
      qt/qt.spec
  2. 6 0
      qt/readme.txt

+ 6 - 2
qt/qt.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 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 @@ Source0:      ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
 #   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 @@ AutoReqProv:  no
         $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
@@ -108,6 +109,9 @@ AutoReqProv:  no
         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
     %{l_shtool} install -c -m 644 \

+ 6 - 0
qt/readme.txt

@@ -19,6 +19,12 @@ standard, making it even harder to troubleshoot.
 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