spec.diff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2422 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/ChangeLog b/development/ChangeLog
index d4d67f5c591e7df010c4be80132c0f3e41055550..56ce415c77d6dcc8602ee2acf8faa0f355c3eed5 100644 (file)
--- a/development/ChangeLog
+++ b/development/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-03 Kayvan Sylvan <kayvan@sylvan.com>
+
+       * lyx.spec.in: Integrate tetex-lyx into main RPM.
+
 2001-08-05  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * Code_rules/Rules: add some braces statements, fix some typos.

diff --git a/development/lyx.spec.in b/development/lyx.spec.in
index 1ebe32a8a383bea0bc5a07587e962269b5ec6cc8..e3e5a8528410c0a3dfc472b676f2a56ba6b7a776 100644 (file)
--- a/development/lyx.spec.in
+++ b/development/lyx.spec.in
@@ -11,6 +11,7 @@ BuildRoot: /var/tmp/rpm/lyx-root
 Icon: lyx.xpm
 Prefix: /usr
 Requires: xforms >= 0.88, tetex-xdvi, tetex, tetex-latex
+Obsoletes: tetex-lyx
 
 %description
 LyX is a modern approach of writing documents with a computer
@@ -62,8 +63,8 @@ gzip -f9 ${RPM_BUILD_ROOT}/usr/man/man?/*
 #
 TEXMF=/usr/share/texmf
 mkdir -p ${RPM_BUILD_ROOT}${TEXMF}/tex/latex
-cp -r ${RPM_BUILD_ROOT}/usr/share/lyx/tex \
-      ${RPM_BUILD_ROOT}${TEXMF}/tex/latex/lyx
+mv ${RPM_BUILD_ROOT}/usr/share/lyx/tex \
+      ${RPM_BUILD_ROOT}/${TEXMF}/tex/latex/lyx
 
 #
 # Miscellaneous files
@@ -75,6 +76,9 @@ cp lib/reLyX/README README.reLyX
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
+# Make TeX understand where LyX-specific packages are
+texhash
+
 # Before configuring lyx for the local system
 # PATH needs to be imported 
 if [ -f /etc/profile ]; then 
@@ -94,42 +98,13 @@ then
         ${RPM_INSTALL_PREFIX}/bin/reLyX
 fi
 
-%post -n tetex-lyx
+%postun
 # Fix the TeX file hash
 #
 texhash
 
-# Before configuring lyx for the local system
-# PATH needs to be imported 
-if [ -f /etc/profile ]; then 
-. /etc/profile
-fi 
-#
-# Now configure LyX
-#
-echo "Re-configuring LyX for your system..."
-cd $RPM_INSTALL_PREFIX/share/lyx
-./configure --srcdir
-
-%postun -n tetex-lyx
-# Fix the TeX file hash
-#
-texhash
-
-# Before configuring lyx for the local system
-# PATH needs to be imported 
-if [ -f /etc/profile ]; then 
-. /etc/profile
-fi 
-#
-# Now configure LyX
-#
-echo "Reconfiguring LyX for your system..."
-cd $RPM_INSTALL_PREFIX/share/lyx
-./configure --srcdir
-
 %files
-%attr(-,root,root) %doc ABOUT-NLS ANNOUNCE OLD-CHANGES COPYING 
+%attr(-,root,root) %doc ABOUT-NLS ANNOUNCE COPYING 
 %attr(-,root,root) %doc README UPGRADING ChangeLog NEWS
 %attr(-,root,root) %doc lib/CREDITS README.reLyX
 
@@ -137,6 +112,4 @@ cd $RPM_INSTALL_PREFIX/share/lyx
 %attr(-,root,root) /usr/man/*
 %attr(-,root,root) /usr/share/locale/*/LC_MESSAGES/*
 %attr(-,root,root) /usr/share/lyx
-
-%files -n tetex-lyx
 %attr(-,root,root) /usr/share/texmf/tex/latex/lyx