patch from Angus and patch from Kayvan

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

diff --git a/development/lyx.spec.in b/development/lyx.spec.in
index 1fb6d09d2c6ea2f8802d7257916477c051015382..aede6edc0211d70fec7e7c1a6c0657470e8c8336 100644 (file)
--- a/development/lyx.spec.in
+++ b/development/lyx.spec.in
@@ -38,8 +38,17 @@ place that the Redhat tetex package is installed and would see it.
 %build
 unset LINGUAS || true
 CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" \
-./configure --prefix=/usr --without-warnings
-make
+./configure --prefix=/usr --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=gcc LYX_LIBS='/usr/lib/libstdc++-libc6.1-1.so.2 -lforms -lXpm'
+else
+       make
+fi
+
 
 %install
 unset LINGUAS || true
@@ -59,7 +68,7 @@ cp -r ${RPM_BUILD_ROOT}/usr/share/lyx/tex \
 #
 # Miscellaneous files
 #
-cp -a images/lyx.xpm ${RPM_BUILD_ROOT}/usr/share/lyx/images/
+cp -a lib/images/lyx.xpm ${RPM_BUILD_ROOT}/usr/share/lyx/images/
 cp lib/reLyX/README README.reLyX
 
 %clean