On Wed, Feb 19, 2003 at 03:18:47PM -0800, Kayvan A. Sylvan wrote:
> I am looking over this patch.
>
> I don't think that the default lyx.spec should be qt-enabled. I will
> submit a patch which includes most (if not all) of Zvezdan's changes.
Okay, this is the patch. It is basically the same as Zvezdan's patch,
minus the --with-pspell and qt frontend.
I think the lyx.spec.in should create xforms RPMs by default and should
work with ispell. I want to know how many people use pspell versus ispell
before I change that part.
---Kayvan
--
Kayvan A. Sylvan | Proud husband of | Father to my kids:
Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena (8/8/89)
http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)
Index: development/lyx.spec.in
===================================================================
RCS file: /cvs/lyx/lyx-devel/development/lyx.spec.in,v
retrieving revision 1.18
diff -u -u -r1.18 lyx.spec.in
--- development/lyx.spec.in 2002/12/19 18:38:30 1.18
+++ development/lyx.spec.in 2003/02/20 08:20:37
@@ -1,16 +1,19 @@
+%define frontend xforms
+%define frontdep libforms >= 1.0
+
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 <[EMAIL PROTECTED]>
-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.89, 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}
+Requires: %{frontdep}, tetex-xdvi, tetex, tetex-latex
Obsoletes: tetex-lyx
%description
@@ -30,14 +33,16 @@
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
-./configure --prefix=%{_prefix} --mandir=%{_mandir} \
- --bindir=%{_bindir} --datadir=%{_datadir} \
- --without-warnings --disable-debug --enable-optimization=-O2
+./configure --with-frontend=%{frontend} --prefix=%{_prefix} \
+ --mandir=%{_mandir} --bindir=%{_bindir} --datadir=%{_datadir} \
+ --without-warnings --disable-debug --enable-optimization=-O2
make
%install
@@ -52,13 +57,13 @@
#
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/
+cp -a lib/images/%{name}.xpm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/images/
cp lib/reLyX/README README.reLyX
%clean
@@ -77,14 +82,13 @@
# 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
