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 194d45d84a53805a00d7b05a71423934d4d1e07b..34442a20dca7c9346241d524d4958654c9d65253 100644 (file)
--- a/development/lyx.spec.in
+++ b/development/lyx.spec.in
@@ -1,16 +1,18 @@
+%define frontend @RPM_FRONTEND@
+%define version_suffix @RPM_VERSION_SUFFIX@
+

 Summary: A WYSIWYM (What You See Is What You Mean) frontend to LaTeX
 Name: @PACKAGE@
 Version: @VERSION@
 Summary: A WYSIWYM (What You See Is What You Mean) frontend to LaTeX
 Name: @PACKAGE@
 Version: @VERSION@

-Release: 1
-Copyright: see COPYING file
-Group: X11/Editors
-Url: http://www.lyx.org/
+Release: 1_%{frontend}
+License: see COPYING file
+Group: Applications/Publishing
+URL: http://www.lyx.org/

 Packager: Kayvan A. Sylvan <kayvan@sylvan.com>
 Packager: Kayvan A. Sylvan <kayvan@sylvan.com>

-Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{PACKAGE_VERSION}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
-Icon: lyx.xpm
-Prefix: /usr
-Requires: xforms >= 0.88, tetex-xdvi, tetex, tetex-latex
+Source: ftp://ftp.lyx.org/pub/lyx/stable/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Icon: %{name}.xpm
+Prefix: %{_prefix}

 Obsoletes: tetex-lyx
 
 %description
 Obsoletes: tetex-lyx
 
 %description


@@ -30,15 +32,17 @@ to the backends (like LaTeX) that are specifically designed for the task.
 With LyX, the author can concentrate on the contents of his writing,
 and let the computer take care of the rest.
 
 With LyX, the author can concentrate on the contents of his writing,
 and let the computer take care of the rest.
 

+This is LyX built with the %{frontend} frontend.
+

 %prep
 %setup
 
 %build
 unset LINGUAS || true
 %prep
 %setup
 
 %build
 unset LINGUAS || true

-CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" \
-./configure --prefix=%{_prefix} --mandir=%{_mandir} \
-       --bindir=%{_bindir} --datadir=%{_datadir} \
-       --without-warnings --with-included-string
+./configure --with-frontend=%{frontend} --prefix=%{_prefix} \
+       --mandir=%{_mandir} --bindir=%{_bindir} --datadir=%{_datadir} \
+       --without-warnings --disable-debug --enable-optimization=-O2 \
+       %{version_suffix}

 make
 
 %install
 make
 
 %install


@@ -53,14 +57,14 @@ gzip -f9 ${RPM_BUILD_ROOT}%{_mandir}/man?/*
 #
 TEXMF=%{_datadir}/texmf
 mkdir -p ${RPM_BUILD_ROOT}${TEXMF}/tex/latex
 #
 TEXMF=%{_datadir}/texmf
 mkdir -p ${RPM_BUILD_ROOT}${TEXMF}/tex/latex

-mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \
-      ${RPM_BUILD_ROOT}/${TEXMF}/tex/latex/lyx
+mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}/tex \
+      ${RPM_BUILD_ROOT}/${TEXMF}/tex/latex/%{name}

 
 #
 # Miscellaneous files
 #
 
 #
 # Miscellaneous files
 #

-cp -a lib/images/lyx.xpm ${RPM_BUILD_ROOT}%{_datadir}/lyx/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}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}


@@ -69,25 +73,6 @@ rm -rf ${RPM_BUILD_ROOT}
 # Make TeX understand where LyX-specific packages are
 texhash
 
 # 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}/lyx
-./configure --srcdir
-
-# Fix reLyX perl program if the prefix is non-standard
-if [ "%{_prefix}" != "/usr" ]
-then
-    perl -pi -e "s!/usr/share/lyx!%{_datadir}/lyx!" \
-        %{_bindir}/reLyX
-fi
-

 %postun
 # Fix the TeX file hash
 #
 %postun
 # Fix the TeX file hash
 #


@@ -95,9 +80,9 @@ texhash
 
 %files
 %defattr(-,root,root)
 
 %files
 %defattr(-,root,root)

-%doc ABOUT-NLS ANNOUNCE COPYING 
+%doc ABOUT-NLS ANNOUNCE COPYING

 %doc README UPGRADING ChangeLog NEWS
 %doc README UPGRADING ChangeLog NEWS

-%doc lib/CREDITS README.reLyX
+%doc lib/CREDITS

 %{_bindir}/*
 %{_mandir}/man?/*
 %{_datadir}/locale/*/LC_MESSAGES/*
 %{_bindir}/*
 %{_mandir}/man?/*
 %{_datadir}/locale/*/LC_MESSAGES/*