Browse Source

Better package, no confusing options.

Ralf S. Engelschall 24 years ago
parent
commit
0302b04eb2
1 changed files with 17 additions and 30 deletions
  1. 17 30
      qt/qt.spec

+ 17 - 30
qt/qt.spec

@@ -23,14 +23,6 @@
 ##  SUCH DAMAGE.
 ##
 
-#   package option, other switch denotes almost all GUI features
-%ifndef       with_freetype
-%define       with_freetype no
-%endif
-%ifndef       with_other
-%define       with_other no
-%endif
-
 #   package information
 Name:         qt
 Summary:      The Qt Toolkit
@@ -41,7 +33,7 @@ Distribution: OpenPKG [REL]
 Group:        X11
 License:      GPL
 Version:      3.0.4
-Release:      20020611
+Release:      20020613
 
 #   list of sources
 Source0:      ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
@@ -49,16 +41,11 @@ 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
-PreReq:       OpenPKG, openpkg >= 20020206, X11
-%if "%{with_freetype}" == "yes"
-BuildPreReq:  freetype
-PreReq:       freetype
-%endif
+BuildPreReq:  OpenPKG, openpkg >= 20020206, gcc, X11, freetype
+PreReq:       OpenPKG, openpkg >= 20020206, X11, freetype
 AutoReq:      no
 AutoReqProv:  no
 
-# FIXME Do we need PreReq to match BuildPreReq?
 %description
     Qt is a GUI (graphical user interface) software toolkit which simplifies
     the task of writing and maintaining GUIs, and allows the developer to
@@ -76,8 +63,10 @@ AutoReqProv:  no
     %setup -q -n qt-x11-free-%{version}
 
 %build
-    QTDIR=`pwd`; export QTDIR
-    PATH="%{l_prefix}/bin:$PATH"; export PATH
+    QTDIR=`pwd`
+    PATH="$QTDIR/bin:$PATH"
+    LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
+    export QTDIR PATH LD_LIBRARY_PATH
     case "%{l_target}" in
         *-freebsd* )
             oscomp="freebsd-g++"
@@ -95,25 +84,21 @@ AutoReqProv:  no
         -platform $oscomp -thread -stl \
         -qt-libpng -qt-libjpeg -qt-libmng \
         -no-nas-sound -no-tablet -no-xkb \
-%if "%{with_freetype}" == "yes"
-        -xft \
-%else
-        -no-xft \
-%endif
-%if "%{with_other}" == "yes"
-        -sm -xinerama -xrender \
-%else
-        -no-sm -no-xinerama -no-xrender \
-%endif
+        -xft -sm -xinerama -xrender \
         -I%{l_prefix}/include \
         -L%{l_prefix}/lib \
-        -R%{l_prefix}/lib
+        -R%{l_prefix}/lib \
+        -L`%{l_prefix}/etc/rc --query x11_libdir` \
+        -R`%{l_prefix}/etc/rc --query x11_libdir`
+# FIXME Remove false path -Wl,-rpath,/tmp/qt-x11-free-3.0.4/lib with sed
     %{l_make} %{l_mflags -O} \
         MAKE="%{l_make} %{l_mflags -O}" \
         symlinks src-moc sub-src sub-tools
 
 %install
     rm -rf $RPM_BUILD_ROOT
+# FIXME %{l_make} %{l_mflags} install prefix=$RPM_BUILD_ROOT%{l_prefix}
+# FIXME Is the mkdir /include/qt made redundant by the next line?
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/bin \
         $RPM_BUILD_ROOT%{l_prefix}/lib \
@@ -121,7 +106,9 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/include/qt/private \
         $RPM_BUILD_ROOT%{l_prefix}/man/man3
     %{l_shtool} install -c -s -m 755 \
-        bin/designer bin/moc bin/uic \
+        bin/qmake bin/moc bin/uic \
+        bin/linguist bin/lrelease bin/lupdate \
+        bin/assistant bin/qtconfig bin/designer \
         $RPM_BUILD_ROOT%{l_prefix}/bin/
 # FIXME Extreme hack
     touch include/qt_windows.h