Fixed some lines that were too long. It compiled afterwards.

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

diff --git a/development/lyx.spec.in b/development/lyx.spec.in
index 294fc87a85fb6a0f5a50a25bc2aa94e7711d0e18..34442a20dca7c9346241d524d4958654c9d65253 100644 (file)
--- a/development/lyx.spec.in
+++ b/development/lyx.spec.in
@@ -1,11 +1,11 @@
 %define frontend @RPM_FRONTEND@
-%define frontdep @RPM_FRONTEND_DEPS@
+%define version_suffix @RPM_VERSION_SUFFIX@
 
 Summary: A WYSIWYM (What You See Is What You Mean) frontend to LaTeX
 Name: @PACKAGE@
 Version: @VERSION@
 Release: 1_%{frontend}
-Copyright: see COPYING file
+License: see COPYING file
 Group: Applications/Publishing
 URL: http://www.lyx.org/
 Packager: Kayvan A. Sylvan <kayvan@sylvan.com>
@@ -13,7 +13,6 @@ Source: ftp://ftp.lyx.org/pub/lyx/stable/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Icon: %{name}.xpm
 Prefix: %{_prefix}
-Requires: %{frontdep}, tetex-xdvi, tetex, tetex-latex
 Obsoletes: tetex-lyx
 
 %description
@@ -42,7 +41,8 @@ This is LyX built with the %{frontend} frontend.
 unset LINGUAS || true
 ./configure --with-frontend=%{frontend} --prefix=%{_prefix} \
        --mandir=%{_mandir} --bindir=%{_bindir} --datadir=%{_datadir} \
-       --without-warnings --disable-debug --enable-optimization=-O2
+       --without-warnings --disable-debug --enable-optimization=-O2 \
+       %{version_suffix}
 make
 
 %install
@@ -63,8 +63,8 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}/tex \
 #
 # Miscellaneous files
 #
-cp -a lib/images/%{name}.xpm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/images/
-cp lib/reLyX/README README.reLyX
+# Don't use %{name}.xpm, this will not work with --version-suffix
+cp -a lib/images/lyx.xpm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/images/
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -73,24 +73,6 @@ rm -rf ${RPM_BUILD_ROOT}
 # 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 
-    . /etc/profile
-fi 
-#
-# Now configure LyX
-#
-echo "Configuring LyX for your system..."
-cd %{_datadir}/%{name}
-./configure --srcdir
-
-# Fix reLyX perl program if the prefix is non-standard
-if [ "%{_prefix}" != "/usr" ]
-then
-    perl -pi -e "s!/usr/share/%{name}!%{_datadir}/%{name}!" %{_bindir}/reLyX
-fi
-
 %postun
 # Fix the TeX file hash
 #
@@ -98,9 +80,9 @@ texhash
 
 %files
 %defattr(-,root,root)
-%doc ABOUT-NLS ANNOUNCE COPYING 
+%doc ABOUT-NLS ANNOUNCE COPYING
 %doc README UPGRADING ChangeLog NEWS
-%doc lib/CREDITS README.reLyX
+%doc lib/CREDITS
 %{_bindir}/*
 %{_mandir}/man?/*
 %{_datadir}/locale/*/LC_MESSAGES/*