Angus Leeming <[EMAIL PROTECTED]> writes:
| On Tuesday 04 February 2003 10:51 pm, Lars Gullik Bjønnes wrote:
| > | Or can you just modify the existing spec file to make 4 rpms and be done
| > | with it?
| >
| > yes.
| >
| > But I will not change anything for 1.3.0.
| >
| > Or... perhaps we should delay 1.3.0 a bit to put this into place... it
| > would fit the xforms and qt better
|
| I think that that is a good idea. Otherwise, we end up looking a bit
| amateurish.
This is how far I got... not really working and giving errors...
I have only modified configure.ac.
? development/lyx-qt.spec
Index: Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/Makefile.am,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile.am
--- Makefile.am 4 Feb 2003 18:13:33 -0000 1.44
+++ Makefile.am 5 Feb 2003 01:55:18 -0000
@@ -28,13 +28,16 @@ dist-hook:
rm -rf `find images -name \*CVS\*`
rpmdist: dist
- ln -s $(srcdir)/lib/images/lyx.xpm . ; \
+ $(LN_S) -f $(srcdir)/lib/images/lyx.xpm . ; \
if [ -z "`type -path rpmbuild`" ]; \
then \
RPMBUILD=rpm; \
else \
RPMBUILD=rpmbuild; \
- fi; $$RPMBUILD -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
+ fi; \
+ cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES/; \
+ $$RPMBUILD -ba development/lyx.spec ; saved_status=$$?; \
+ $$RPMBUILD -bb development/lyx-qt.spec ; saved_status=$$?; \
rm lyx.xpm; exit $$saved_status
bindist:
Index: config/configure.ac
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/configure.ac,v
retrieving revision 1.23
diff -u -p -r1.23 configure.ac
--- config/configure.ac 30 Jan 2003 10:05:18 -0000 1.23
+++ config/configure.ac 5 Feb 2003 01:55:18 -0000
@@ -238,7 +238,7 @@ AC_TYPE_SIGNAL
AC_TYPE_SIZE_T
AC_TYPE_UID_T
-AC_CHECK_FUNCS(snprintf vsnprintf)
+AC_CHECK_FUNCS(snprintf vsnprintf strerror)
LYX_CHECK_DECL(snprintf, stdio.h)
LYX_CHECK_DECL(vsnprintf, stdio.h)
LYX_CHECK_DECL(istreambuf_iterator, iterator)
@@ -361,6 +361,7 @@ AC_CONFIG_FILES([Makefile \
config/Makefile \
development/Makefile \
development/lyx.spec \
+ development/lyx-qt.spec \
lib/Makefile \
intl/Makefile \
po/Makefile.in \
Index: development/lyx-qt.spec.in
===================================================================
RCS file: development/lyx-qt.spec.in
diff -N development/lyx-qt.spec.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ development/lyx-qt.spec.in 5 Feb 2003 01:55:19 -0000
@@ -0,0 +1,80 @@
+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/
+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: qt
+Obsoletes: tetex-lyx
+
+%package -n lyx-qt
+Summary: LyX Qt binary
+Requires: qt
+Group: X11/Editors
+
+%description -n lyx-qt
+LyX is a modern approach to writing documents which breaks with the
+obsolete "typewriter paradigm" of most other document preparation
+systems.
+
+It is designed for people who want professional quality output
+with a minimum of time and effort, without becoming specialists in
+typesetting.
+
+The major innovation in LyX is WYSIWYM (What You See Is What You Mean).
+That is, the author focuses on content, not on the details of formatting.
+This allows for greater productivity, and leaves the final typesetting
+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 the LyX Qt frontend binary.
+
+%prep
+%setup
+
+%build
+unset LINGUAS || true
+./configure --with-frontend=qt--prefix=%{_prefix} --mandir=%{_mandir} \
+ --bindir=%{_bindir} --datadir=%{_datadir} \
+ --without-warnings --disable-debug --enable-optimization=-O2
+make
+
+%install
+unset LINGUAS || true
+rm -rf ${RPM_BUILD_ROOT}
+install -d -m 755 ${RPM_BUILD_ROOT}
+make DESTDIR=${RPM_BUILD_ROOT} install
+gzip -f9 ${RPM_BUILD_ROOT}%{_mandir}/man?/*
+
+#
+# Set up the lyx-specific class files where TeX can see them
+#
+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
+
+#
+# Miscellaneous files
+#
+cp -a lib/images/lyx.xpm ${RPM_BUILD_ROOT}%{_datadir}/lyx/images/
+cp lib/reLyX/README README.reLyX
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+%post
+
+%postun
+
+%files -n lyx-qt
+%defattr(-,root,root)
+%{_bindir}/lyx
Index: development/lyx.spec.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/development/lyx.spec.in,v
retrieving revision 1.18
diff -u -p -r1.18 lyx.spec.in
--- development/lyx.spec.in 19 Dec 2002 18:38:30 -0000 1.18
+++ development/lyx.spec.in 5 Feb 2003 01:55:19 -0000
@@ -30,12 +30,61 @@ to the backends (like LaTeX) that are sp
With LyX, the author can concentrate on the contents of his writing,
and let the computer take care of the rest.
+%package -n lyx-common
+Summary: Files common to the different lyx binary frontends.
+Requires: tetex-xdvi, tetex, tetex-latex
+Group: X11/Editors
+
+%description -n lyx-common
+LyX is a modern approach to writing documents which breaks with the
+obsolete "typewriter paradigm" of most other document preparation
+systems.
+
+It is designed for people who want professional quality output
+with a minimum of time and effort, without becoming specialists in
+typesetting.
+
+The major innovation in LyX is WYSIWYM (What You See Is What You Mean).
+That is, the author focuses on content, not on the details of formatting.
+This allows for greater productivity, and leaves the final typesetting
+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 the parts common to the different frontends.
+
+%package -n lyx-xforms
+Summary: The LyX XForms frontend.
+Requires: lyx-common, xforms >= 0.89
+Group: X11/Editors
+
+%description -n lyx-xforms
+LyX is a modern approach to writing documents which breaks with the
+obsolete "typewriter paradigm" of most other document preparation
+systems.
+
+It is designed for people who want professional quality output
+with a minimum of time and effort, without becoming specialists in
+typesetting.
+
+The major innovation in LyX is WYSIWYM (What You See Is What You Mean).
+That is, the author focuses on content, not on the details of formatting.
+This allows for greater productivity, and leaves the final typesetting
+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 the XForms frontend binary of LyX.
+
%prep
%setup
%build
unset LINGUAS || true
-./configure --prefix=%{_prefix} --mandir=%{_mandir} \
+./configure --with-frontend=xforms --program-suffix=-xforms \
+ --prefix=%{_prefix} --mandir=%{_mandir} \
--bindir=%{_bindir} --datadir=%{_datadir} \
--without-warnings --disable-debug --enable-optimization=-O2
make
@@ -64,7 +113,8 @@ cp lib/reLyX/README README.reLyX
%clean
rm -rf ${RPM_BUILD_ROOT}
-%post
+
+%post -n lyx-common
# Make TeX understand where LyX-specific packages are
texhash
@@ -87,18 +137,23 @@ then
%{_bindir}/reLyX
fi
-%postun
+%postun -n lyx-common
# Fix the TeX file hash
#
texhash
-%files
+%files -n lyx-common
%defattr(-,root,root)
%doc ABOUT-NLS ANNOUNCE COPYING
%doc README UPGRADING ChangeLog NEWS
%doc lib/CREDITS README.reLyX
-%{_bindir}/*
+%{_bindir}/noweb2lyx
+%{_bindir}/reLyX
%{_mandir}/man?/*
%{_datadir}/locale/*/LC_MESSAGES/*
%{_datadir}/%{name}
%{_datadir}/texmf/tex/latex/%{name}
+
+%files -n lyx-xforms
+%defattr(-,root,root)
+%{_bindir}/lyx-xforms
--
Lgb
