Am Mittwoch, 8. Januar 2003 14:02 schrieb Jean-Marc Lasgouttes:
> Hello,
>
> It seems that we need to release LyX 1.2.3 right now. Please find
> appended the list of changes that are in cvs currently. If there is a
> patch that you really think should be added, please tell me about it.
i have one attached
it does the following:
- add a desktop file
- correct the spec file to use License: instead of Copyright: (rpm-4.x)
- and use a commonly used (in RH) and better fitting Group:
- and let rpm compress the man pages
- extend and fix dependencies, i.e. Requires: for libraries are not needed
- and depend on xforms >= 1.0
- update lyx.rpm.README to reflect the changes
- use rpmbuild for make rpmdist (rpm 4.x)
so it should work for rh62 and above
--
ronny
--- development/lyx.desktop.in Wed Jan 8 14:46:19 2003
+++ development/lyx.desktop.in Wed Jan 8 14:46:19 2003
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=LyX
+Comment=A WYSIWYM document processor
+Icon=@datadir@/lyx/images/lyx.xpm
+Exec=lyx
+Terminal=0
+Type=Application
+EOF
Index: Makefile.am
===================================================================
RCS file: /cvs/lyx/lyx-devel/Makefile.am,v
retrieving revision 1.37
diff -u -r1.37 Makefile.am
--- Makefile.am 2002/04/26 10:32:22 1.37
+++ Makefile.am 2003/01/08 14:19:19
@@ -5,6 +5,7 @@
MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
$(srcdir)/configure $(srcdir)/development/lyx.spec \
+ $(srcdir)/development/lyx.desktop \
$(srcdir)/acinclude.m4
SUBDIRS = config intl po sigc++ boost src lib
@@ -32,7 +33,7 @@
rpmdist: dist
ln -s lib/images/lyx.xpm . ; \
- rpm -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
+ rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
rm lyx.xpm; exit $$saved_status
bindist:
Index: configure.in
===================================================================
RCS file: /cvs/lyx/lyx-devel/Attic/configure.in,v
retrieving revision 1.120.2.16
diff -u -r1.120.2.16 configure.in
--- configure.in 2002/12/16 15:07:44 1.120.2.16
+++ configure.in 2003/01/08 14:19:24
@@ -363,6 +363,7 @@
boost/Makefile \
config/Makefile \
development/lyx.spec \
+ development/lyx.desktop \
lib/Makefile \
intl/Makefile \
po/Makefile.in \
Index: development/lyx.spec.in
===================================================================
RCS file: /cvs/lyx/lyx-devel/development/lyx.spec.in,v
retrieving revision 1.14.2.1
diff -u -r1.14.2.1 lyx.spec.in
--- development/lyx.spec.in 2002/07/26 12:17:20 1.14.2.1
+++ development/lyx.spec.in 2003/01/08 14:19:25
@@ -2,16 +2,20 @@
Name: @PACKAGE@
Version: @VERSION@
Release: 1
-Copyright: see COPYING file
-Group: X11/Editors
+License: see COPYING file
+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.88, tetex-xdvi, tetex, tetex-latex
+BuildRequires: xforms-devel >= 1.0
+%{!?_without_pspell:BuildRequires: pspell-devel}
+Requires: tetex-fonts, tetex-xdvi, tetex, tetex-latex
+%{!?_without_pspell:Requires: aspell}
Obsoletes: tetex-lyx
+PreReq: /usr/bin/perl
%description
LyX is a modern approach to writing documents which breaks with the
@@ -40,15 +44,17 @@
CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{_prefix} --mandir=%{_mandir} \
--bindir=%{_bindir} --datadir=%{_datadir} \
- --without-warnings $ISTRING
+ --without-warnings \
+ %{!?_without_pspell:--with-pspell} \
+ $ISTRING
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?/*
+# transform shouldn't be needed, but something is doing strange things
+make DESTDIR=${RPM_BUILD_ROOT} transform='' install
#
# Set up the lyx-specific class files where TeX can see them
@@ -64,6 +70,12 @@
cp -a lib/images/lyx.xpm ${RPM_BUILD_ROOT}%{_datadir}/lyx/images/
cp lib/reLyX/README README.reLyX
+#
+# Desktop file
+#
+mkdir -p ${RPM_BUILD_ROOT}/etc/X11/applnk/Applications
+cp development/lyx.desktop ${RPM_BUILD_ROOT}/etc/X11/applnk/Applications
+
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -71,6 +83,9 @@
# Make TeX understand where LyX-specific packages are
texhash
+# Register fonts
+[[ -n "$(which chkfontpath 2>/dev/null)" ]] && chkfontpath -a %{_datadir}/%{name}/xfonts
+
# Before configuring lyx for the local system
# PATH needs to be imported
if [ -f /etc/profile ]; then
@@ -95,11 +110,15 @@
#
texhash
+# Unregister fonts
+[[ -n "$(which chkfontpath 2>/dev/null)" ]] && chkfontpath -r %{_datadir}/%{name}/xfonts
+
%files
%defattr(-,root,root)
%doc ABOUT-NLS ANNOUNCE COPYING
%doc README UPGRADING ChangeLog NEWS
%doc lib/CREDITS README.reLyX
+/etc/X11/applnk/Applications/lyx.desktop
%{_bindir}/*
%{_mandir}/man?/*
%{_datadir}/locale/*/LC_MESSAGES/*
Index: development/lyx.rpm.README
===================================================================
RCS file: /cvs/lyx/lyx-devel/development/lyx.rpm.README,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 lyx.rpm.README
--- development/lyx.rpm.README 1999/09/27 18:44:29 1.1.1.1
+++ development/lyx.rpm.README 2003/01/08 15:30:46
@@ -1,37 +1,36 @@
-Here is what to do to make a binary rpm using the spec file lyx.spec.
-The description below apply only to the Intel platform, but only minor
-changes should be needed for other platforms.
+Here is what to do to make a binary rpm for Red Hat Linux using the
+spec file lyx.spec. The description below applies only to the Intel
+platform, but only minor changes should be needed for other platforms.
-1) Install xforms-88 or later. You can find an xforms-0.88 rpm
+1) Install xforms-1.0 or later. You can find an xforms-1.0 rpm
at
-ftp://moni.msci.memphis.edu/pub
+ftp://ftp.lyx.org/pub/lyx/contrib/
+You also need the xforms-devel package in order to compile LyX.
+
2) Install LaTeX. You can do this using rpms (you need tetex-xdvi,
-tetex, tetex-latex) from your RH distribution.
+tetex, tetex-latex and tetex-fonts) from your RH distribution.
3) Copy lyx.spec to /usr/src/redhat/SPECS
-4) Copy lyx-1.0.0.tar.gz to /usr/src/redhat/SOURCES
+4) Copy lyx-1.2.3.tar.gz to /usr/src/redhat/SOURCES
5) Issue the command
+
+ rpmbuild -bb /usr/src/redhat/SPECS/lyx.spec
- rpm -bb /usr/src/redhat/SPECS/lyx.spec
+Note: RPM >= 4.0 is required.
This builds the binary rpm, and puts it in /usr/src/redhat/RPMS/i386.
Note that building lyx requires about 35M free space on your disk.
-6) Now install the package:
+LyX is build by default with support for spell checking through the
+pspell library. If you don't want this, start rpmbuild with the option
- rpm -Uvh /usr/src/redhat/RPMS/i386/lyx-1.0.0-1.i386.rpm
+ --without-pspell
-If you get dependency errors about xforms or tetex, then you need to
-use the --nodeps option (because you installed xforms or tetex not in
-rpm form):
-
- rpm -Uvh --nodeps /usr/src/redhat/RPMS/i386/lyx-1.0.0-1.i386.rpm
+6) Now install the package:
-You should not get any more errors.
-
[EMAIL PROTECTED]
+ rpm -Uvh /usr/src/redhat/RPMS/i386/lyx-1.2.3-1.i386.rpm
