Fix qt option, release

lyx/lyx.spec

@@ -23,8 +23,6 @@
 ##  SUCH DAMAGE.
 ##
 
-#   FIXME: mlelstv: JUNK because Qt does not yet build
-
 #   package versions
 %define       V_lyx    1.3.1
 %define       V_xforms 1.0
@@ -35,24 +33,14 @@ Summary:      Graphical frontend for LaTeX (nearly WYSIWYG)
 URL:          http://www.lyx.org/
 Vendor:       The LyX Team
 Packager:     The OpenPKG Project
-Distribution: OpenPKG [JUNK]
+Distribution: OpenPKG [EVAL]
 Group:        Print
 License:      GPL
 Version:      %{V_lyx}
-Release:      20030424
+Release:      20030428
 
 #   package options
-%option       with_xforms yes
-%option       with_qt     no
-
-%if "%{with_xforms}" == "yes"
-%undefine     with_qt
-%define       with_qt     no
-%endif
-%if "%{with_xforms}" == "no"
-%undefine     with_qt
-%define       with_qt     yes
-%endif
+%option       with_qt no
 
 #   list of sources
 Source0:      ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{V_lyx}.tar.gz
@@ -64,14 +52,13 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20030103, make, gcc, perl
 BuildPreReq:  X11, tetex, gettext, libiconv
-%if "%{with_xforms}" == "yes"
-BuildPreReq:  jpeg, tiff, xpm
-%endif
 %if "%{with_qt}" == "yes"
 BuildPreReq:  qt
+%else
+BuildPreReq:  jpeg, tiff, xpm
 %endif
-PreReq:       OpenPKG, openpkg >= 20030103
-PreReq:       X11, tetex, tetex::with_x11 = yes, gv, ghostscript
+PreReq:       OpenPKG, openpkg >= 20030103, X11, tetex, tetex::with_x11 = yes
+PreReq:       gv, ghostscript, ghostscript::with_x11 = yes
 AutoReq:      no
 AutoReqProv:  no
 
@@ -83,7 +70,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q -c
-%if "%{with_xforms}" == "yes"
+%if "%{with_qt}" != "yes"
     %setup -q -T -D -a 1
     ( cd xforms-%{V_xforms}
       %patch0 -p0
@@ -94,7 +81,7 @@ AutoReqProv:  no
     x11_bin=`%{l_prefix}/etc/rc --query x11_bindir`
     x11_inc=`%{l_prefix}/etc/rc --query x11_incdir`
     x11_lib=`%{l_prefix}/etc/rc --query x11_libdir`
-%if "%{with_xforms}" == "yes"
+%if "%{with_qt}" != "yes"
     ( cd xforms-%{V_xforms}
       %{l_shtool} subst \
         -e 's;@l_prefix@;%{l_prefix};g' \
@@ -111,7 +98,8 @@ AutoReqProv:  no
 
     ( cd lyx-%{V_lyx}
 %if "%{with_qt}" == "yes"
-      echo "qt_cv_libname=qt-mt" >config.cache
+      echo "qt_cv_libname=qt" >config.cache
+      EXTRALIBS="-lqt -lXft -lGL -lXinerama"
 %endif
       CC="%{l_cc}" \
       CXX="%{l_cxx}" \
@@ -132,14 +120,13 @@ AutoReqProv:  no
           --with-qt-libraries="%{l_prefix}/lib" \
           --with-qt-includes="%{l_prefix}/include/qt" \
           --with-frontend=qt \
-%endif
-%if "%{with_xforms}" == "yes"
+%else
           --with-frontend=xforms \
           --with-extra-lib=$RPM_BUILD_ROOT%{l_prefix}/lib \
           --with-extra-inc=$RPM_BUILD_ROOT%{l_prefix}/include/X11 \
 %endif
           --without-aiksaurus
-      %{l_make} %{l_mflags -O}
+      %{l_make} %{l_mflags -O} LIBS="$LIBS $EXTRALIBS"
     ) || exit 1
 
 %install
@@ -149,8 +136,7 @@ AutoReqProv:  no
     ) || exit 1
 
 %if "%{with_qt}" == "yes"
-%endif
-%if "%{with_xforms}" == "yes"
+%else
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/include
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib
 %endif