Removed locale files, renamed option to with_xforms, and try to fix binding to libqt across all platforms

lyx/lyx.spec

@@ -37,10 +37,10 @@ Distribution: OpenPKG [EVAL]
 Group:        Print
 License:      GPL
 Version:      %{V_lyx}
-Release:      20030506
+Release:      20030508
 
 #   package options
-%option       with_qt no
+%option       with_xforms no
 
 #   list of sources
 Source0:      ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{V_lyx}.tar.gz
@@ -53,10 +53,10 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20030103, make, gcc, perl
 BuildPreReq:  X11, tetex, gettext, libiconv
-%if "%{with_qt}" == "yes"
-BuildPreReq:  qt
-%else
+%if "%{with_xforms}" == "yes"
 BuildPreReq:  jpeg, tiff, xpm
+%else
+BuildPreReq:  qt
 %endif
 PreReq:       OpenPKG, openpkg >= 20030103, X11, tetex, tetex::with_x11 = yes
 PreReq:       gv, ghostscript, ghostscript::with_x11 = yes
@@ -72,7 +72,7 @@ AutoReqProv:  no
 %prep
     %setup -q
     %patch0 -p1
-%if "%{with_qt}" != "yes"
+%if "%{with_xforms}" == "yes"
     %setup -q -T -D -a 1
     ( cd xforms-%{V_xforms}
       %patch1 -p0
@@ -83,7 +83,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_qt}" != "yes"
+%if "%{with_xforms}" == "yes"
     ( cd xforms-%{V_xforms}
       %{l_shtool} subst \
         -e 's;@l_prefix@;%{l_prefix};g' \
@@ -99,9 +99,10 @@ AutoReqProv:  no
 %endif
 
     ( cd lyx-%{V_lyx}
-%if "%{with_qt}" == "yes"
+%if "%{with_xforms}" == "yes"
+%else
       echo "qt_cv_libname=qt" >config.cache
-      EXTRALIBS="-lqt -lXft -lGL -lXinerama"
+      EXTRALIBS="-lqt"
 %endif
       CC="%{l_cc}" \
       CXX="%{l_cxx}" \
@@ -117,15 +118,15 @@ AutoReqProv:  no
           --x-includes=$x11_inc \
           --x-libraries=$x11_lib \
           --disable-shared \
-%if "%{with_qt}" == "yes"
-          --with-qt-dir=%{l_prefix} \
-          --with-qt-libraries="%{l_prefix}/lib" \
-          --with-qt-includes="%{l_prefix}/include/qt" \
-          --with-frontend=qt \
-%else
+%if "%{with_xforms}" == "yes"
           --with-frontend=xforms \
           --with-extra-lib=$RPM_BUILD_ROOT%{l_prefix}/lib \
           --with-extra-inc=$RPM_BUILD_ROOT%{l_prefix}/include/X11 \
+%else
+          --with-frontend=qt \
+          --with-qt-dir=%{l_prefix} \
+          --with-qt-libraries="%{l_prefix}/lib" \
+          --with-qt-includes="%{l_prefix}/include/qt" \
 %endif
           --without-aiksaurus
       %{l_make} %{l_mflags -O} LIBS="$LIBS $EXTRALIBS"
@@ -137,11 +138,11 @@ AutoReqProv:  no
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     ) || exit 1
 
-%if "%{with_qt}" == "yes"
-%else
+%if "%{with_xforms}" == "yes"
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/include
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib
 %endif
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale
 
     #   preset known helper applications
     %{l_shtool} subst \