Hi folks,
Please apply this patch to bring the RPM generation process in
line with the current directory structure.
Thanks.
---Kayvan
--
Kayvan A. Sylvan | Proud husband of | Father to my kids:
Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena
http://www.successlinks.com/kayvan | Reach your goals now! | Robin Gregory
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
retrieving revision 1.450
diff -u -r1.450 ChangeLog
--- ChangeLog 2000/07/26 15:16:53 1.450
+++ ChangeLog 2000/07/26 17:39:14
@@ -1,3 +1,9 @@
+2000-07-26 Kayvan A. Sylvan <[EMAIL PROTECTED]>
+
+ * development/lyx.spec.in
+ * Makefile.am: Fix buglet for LyX RPM generation resulting from
+ file/directory re-organization.
+
2000-07-26 Juergen Vigna <[EMAIL PROTECTED]>
* renamed frontend from gtk to gnome as it is that what is realized
and did the necessary changes in the files.
Index: Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- Makefile.am 2000/06/27 15:24:11 1.12
+++ Makefile.am 2000/07/26 17:39:14
@@ -25,7 +25,7 @@
rm -rf `find images -name \*CVS\*`
rpmdist: dist
- ln -s images/lyx.xpm . ; \
+ ln -s lib/images/lyx.xpm . ; \
rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; \
rm lyx.xpm
Index: development/lyx.spec.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/development/lyx.spec.in,v
retrieving revision 1.7
diff -u -r1.7 lyx.spec.in
--- development/lyx.spec.in 2000/06/19 08:30:32 1.7
+++ development/lyx.spec.in 2000/07/26 17:39:15
@@ -38,9 +38,18 @@
%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
rm -rf ${RPM_BUILD_ROOT}
@@ -59,7 +68,7 @@
#
# 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
