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 93fdcbc1ccad8e6b8dc416024becd673cf4f3fbf..aede6edc0211d70fec7e7c1a6c0657470e8c8336 100644 (file)
--- a/development/lyx.spec.in
+++ b/development/lyx.spec.in
@@ -36,10 +36,22 @@ place that the Redhat tetex package is installed and would see it.
 %setup
 
 %build
-CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr 
-make
+unset LINGUAS || true
+CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" \
+./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
 rm -rf ${RPM_BUILD_ROOT}
 install -d -m 755 ${RPM_BUILD_ROOT}
 make prefix=${RPM_BUILD_ROOT}/usr install
@@ -56,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
@@ -110,8 +122,8 @@ cd $RPM_INSTALL_PREFIX/share/lyx
 ./configure --srcdir
 
 %files
-%attr(-,root,root) %doc ABOUT-NLS ANNOUNCE CHANGES COPYING 
-%attr(-,root,root) %doc README UPGRADING WHATSNEW
+%attr(-,root,root) %doc ABOUT-NLS ANNOUNCE OLD-CHANGES COPYING 
+%attr(-,root,root) %doc README UPGRADING ChangeLog NEWS
 %attr(-,root,root) %doc lib/CREDITS README.reLyX
 
 %attr(-,root,root) /usr/bin/*