Use getBBUnits in both frontends.

[lyx.git] / development / lyx.spec.in

diff --git a/development/lyx.spec.in b/development/lyx.spec.in
index b706f541e4469e3bc6e553a7304870c6567da124..7f827db8b09b2cc9b3b3420a50f93af9dec606e3 100644 (file)
--- a/development/lyx.spec.in
+++ b/development/lyx.spec.in
@@ -35,20 +35,10 @@ and let the computer take care of the rest.
 
 %build
 unset LINGUAS || true
-CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" \
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} \
        --bindir=%{_bindir} --datadir=%{_datadir} \
-       --without-warnings --with-included-string
-# The following check is to ensure that lyx RPMs generated on RH 6.X machines
-# with gcc-2.95 still run against older Redhat OS/compiler combinations.
-# It will eventually be ripped out.
-if [ -r /usr/lib/libstdc++-libc6.1-1.so.2 ]
-then
-       make CXX=g++ LYX_LIBS='/usr/lib/libstdc++-libc6.1-1.so.2 -lforms -lXpm'
-else
-       make
-fi
-
+       --without-warnings --disable-debug --enable-optimization=-O2
+make
 
 %install
 unset LINGUAS || true
@@ -103,7 +93,7 @@ fi
 texhash
 
 %files
-%attr(-,root,root)
+%defattr(-,root,root)
 %doc ABOUT-NLS ANNOUNCE COPYING 
 %doc README UPGRADING ChangeLog NEWS
 %doc lib/CREDITS README.reLyX