Browse Source

cleanup, add new FIXMEs

Ralf S. Engelschall 24 years ago
parent
commit
cfe8b2024f
1 changed files with 13 additions and 21 deletions
  1. 13 21
      qt/qt.spec

+ 13 - 21
qt/qt.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [REL]
 Group:        X11
 License:      GPL
 Version:      3.0.4
-Release:      20020613
+Release:      20020623
 
 #   list of sources
 Source0:      ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
@@ -68,15 +68,10 @@ AutoReqProv:  no
     LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
     export QTDIR PATH LD_LIBRARY_PATH
     case "%{l_target}" in
-        *-freebsd* )
-            oscomp="freebsd-g++"
-            ;;
-        *-linux* )
-            oscomp="linux-g++"
-            ;;
-        *-solaris* )
-            oscomp="solaris-g++"
-            ;;
+        *-freebsd* ) oscomp="freebsd-g++" ;;
+        *-linux*   ) oscomp="linux-g++"   ;;
+        *-solaris* ) oscomp="solaris-g++" ;;
+        * ) echo "platform %{l_target} not supported" 2>&1; exit 1 ;;
     esac
     echo "yes" | ./configure \
         -prefix %{l_prefix} -release \
@@ -90,19 +85,19 @@ AutoReqProv:  no
         -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
+    # FIXME: "-Wl,-rpath,/tmp/qt-x11-free-3.0.4/lib"
+    # FIXME: "QSettings: error creating /cw/.qt"
+    # FIXME: "libpng warning: Application was compiled with png.h from libpng-1.2.3"
+    #        "libpng warning: Application  is running with png.c from libpng-1.0.12"
 
 %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 \
-        $RPM_BUILD_ROOT%{l_prefix}/include/qt \
         $RPM_BUILD_ROOT%{l_prefix}/include/qt/private \
         $RPM_BUILD_ROOT%{l_prefix}/man/man3
     %{l_shtool} install -c -s -m 755 \
@@ -110,15 +105,12 @@ AutoReqProv:  no
         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
     %{l_shtool} install -c -m 644 \
-        include/* $RPM_BUILD_ROOT%{l_prefix}/include/qt/
-# FIXME This is a kludge, too
-    rm $RPM_BUILD_ROOT%{l_prefix}/include/qt/qt_windows.h
-# FIXME This line should be integrated into the last shtool install
+        include/*.h $RPM_BUILD_ROOT%{l_prefix}/include/qt/
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/include/qt/qt_windows.h
+    touch $RPM_BUILD_ROOT%{l_prefix}/include/qt/qt_windows.h
     %{l_shtool} install -c -m 644 \
-        include/private/* $RPM_BUILD_ROOT%{l_prefix}/include/qt/private/
+        include/private/*.h $RPM_BUILD_ROOT%{l_prefix}/include/qt/private/
     ( cd lib && tar cf - * ) |\
     ( cd $RPM_BUILD_ROOT%{l_prefix}/lib && tar xf - )
     ( cd doc/man/man3