two more kludges bite the dust

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

diff --git a/development/lyx.spec.in b/development/lyx.spec.in
index 194d45d84a53805a00d7b05a71423934d4d1e07b..fdf81f1ac13164486a35e18d6bb63ddaa9939cc7 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@
-Release: 1
+Release: 1_%{frontend}
 Copyright: see COPYING file
-Group: X11/Editors
-Url: http://www.lyx.org/
+Group: Applications/Publishing
+URL: http://www.lyx.org/
 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
@@ -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.
 
+This is LyX built with the %{frontend} frontend.
+
 %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
@@ -53,13 +57,14 @@ gzip -f9 ${RPM_BUILD_ROOT}%{_mandir}/man?/*
 #
 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
 #
-cp -a lib/images/lyx.xpm ${RPM_BUILD_ROOT}%{_datadir}/lyx/images/
+# Don't use %{name}.xpm, this will not work with --version-suffix
+cp -a lib/images/lyx.xpm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/images/
 cp lib/reLyX/README README.reLyX
 
 %clean
@@ -70,22 +75,21 @@ rm -rf ${RPM_BUILD_ROOT}
 texhash
 
 # Before configuring lyx for the local system
-# PATH needs to be imported 
-if [ -f /etc/profile ]; then 
+# PATH needs to be imported
+if [ -f /etc/profile ]; then
     . /etc/profile
-fi 
+fi
 #
 # Now configure LyX
 #
 echo "Configuring LyX for your system..."
-cd %{_datadir}/lyx
+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/lyx!%{_datadir}/lyx!" \
-        %{_bindir}/reLyX
+    perl -pi -e "s!/usr/share/%{name}!%{_datadir}/%{name}!" %{_bindir}/reLyX
 fi
 
 %postun
@@ -95,7 +99,7 @@ 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
 %{_bindir}/*