rpms/lyx/FC-4 helpers.conf, NONE, 1.1 helpers.sh, NONE, 1.1 lyx-qt.desktop, NONE, 1.1 lyx-xforms.desktop, NONE, 1.1 lyx.conf, NONE, 1.1 lyx.sh, NONE, 1.1 .cvsignore, 1.2, 1.3 lyx.desktop, 1.2, 1.3 lyx.spec, 1.13, 1.14 sources, 1.4, 1.5 find_helpers.sh, 1.1, NONE lyx-1.3.5-helpers.patch, 1.3, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Jan 20 17:51:39 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19308
Modified Files:
.cvsignore lyx.desktop lyx.spec sources
Added Files:
helpers.conf helpers.sh lyx-qt.desktop lyx-xforms.desktop
lyx.conf lyx.sh
Removed Files:
find_helpers.sh lyx-1.3.5-helpers.patch
Log Message:
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-3
- cleanup/fix snarfing of intermediate frontend builds.
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
- BR: libXpm-devel
* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
- 1.3.7
- -qt/-xforms: frontend pkgs (#178116)
* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-5
- %%post/%%postun: update-desktop-database
--- NEW FILE helpers.conf ---
ps_viewers="evince gsview32 gsview ggv kghostview gv ghostview"
***** Error reading new file: [Errno 2] No such file or directory: 'helpers.sh'
--- NEW FILE lyx-qt.desktop ---
[Desktop Entry]
Name=LyX-qt
GenericName=WYSIWYM document processor
Comment=Lyx using Qt frontend
Exec=lyx-qt
Icon=lyx
MimeType=application/x-lyx;text/x-lyx;
Type=Application
Encoding=UTF-8
Categories=Qt;Application;Office;
--- NEW FILE lyx-xforms.desktop ---
[Desktop Entry]
Name=LyX-xforms
GenericName=WYSIWYM document processor
Comment=Lyx using XForms frontend
Exec=lyx-xforms
Icon=lyx
MimeType=application/x-lyx;text/x-lyx;
Type=Application
Encoding=UTF-8
Categories=Qt;Application;Office;
--- NEW FILE lyx.conf ---
LYX_FRONTEND=lyx-qt
--- NEW FILE lyx.sh ---
#!/bin/bash
if [ -f /etc/lyx/lyx.conf ]; then
source /etc/lyx/lyx.conf
fi
if [ -f ${HOME}/.lyx/lyx.conf ]; then
source ${HOME}/.lyx/lyx.conf
fi
if [ -z "${LYX_FRONTEND}" ]; then
LYX_FRONTEND=qt
fi
# Try LYX_FRONTEND
which lyx-${LYX_FRONTEND} >& /dev/null && \
exec lyx-${LYX_FRONTEND} ${1+"$@"}
# Fall back to trying lyx-qt, lyx-xforms
for frontend in qt xforms ; do
which lyx-$frontend >& /dev/null && exec lyx-$frontend ${1+"$@"} ||:
done
# ERROR should not reach this point
exit 1
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:51:01 -0000 1.2
+++ .cvsignore 20 Jan 2006 17:51:39 -0000 1.3
@@ -1 +1 @@
-lyx-1.3.4.tar.bz2
+lyx-1.3.7.tar.bz2
Index: lyx.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lyx.desktop 4 Dec 2004 12:21:23 -0000 1.2
+++ lyx.desktop 20 Jan 2006 17:51:39 -0000 1.3
@@ -3,7 +3,7 @@
GenericName=WYSIWYM document processor
Comment=WYSIWYM document processor
Exec=lyx
-Icon=lyx.png
+Icon=lyx
MimeType=application/x-lyx;text/x-lyx;
Type=Application
Encoding=UTF-8
Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lyx.spec 2 Sep 2005 12:16:20 -0000 1.13
+++ lyx.spec 20 Jan 2006 17:51:39 -0000 1.14
@@ -1,32 +1,46 @@
Summary: WYSIWYM (What You See Is What You Mean) document processor
Name: lyx
-Version: 1.3.6
-Release: 4%{?dist}%{?kde}
+Version: 1.3.7
+Release: 3%{?dist}
License: GPL
Group: Applications/Publishing
Url: http://www.lyx.org/
-Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.6.tar.gz
+Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: lyx-1.3.5-helpers.patch
+Patch1: lyx-1.3.7-helpers.patch
+Patch2: lyx-1.3.7-noxfonts.patch
+
+# app-wrapper for various frontends
+Source10: lyx.sh
+
+Source20: lyx.desktop
+Source21: lyx-qt.desktop
+Source22: lyx-xforms.desktop
-Source1: lyx.desktop
# "borrow" kde's crystal icon for lyx
-Source2: lyx-crystal.png
+Source30: lyx-crystal.png
# TODO: use this find_helpers.sh script at runtime, instead of depending on
# lyx's configure and %%triggers
-Source10: find_helpers.sh
+#Source100: helpers.sh
+
+# qt frontend
+BuildRequires: qt-devel
+# xforms frontend
+BuildRequires: xforms-devel
+BuildRequires: libjpeg-devel
+%if "{?fedora}" > "4"
+BuildRequires: libXpm-devel
+%endif
BuildRequires: desktop-file-utils
BuildRequires: aiksaurus-devel
BuildRequires: aspell-devel
BuildRequires: tetex-latex
BuildRequires: tetex-fonts
-#BuildRequires: /usr/X11R6/bin/makepsres
-BuildRequires: xorg-x11
# For texhash
Requires(post): tetex-fonts
@@ -37,13 +51,7 @@
Requires: mathml-fonts
Requires: ghostscript
Requires: htmlview
-
-BuildRequires: qt-devel >= 1:3.3
-%if "%{?kde}" != "%{nil}"
-# kde-redhat crud, not needed in Fedora Extras
-%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )}
-Requires: qt >= 1:%{qt_ver}
-%endif
+Requires: %{name}-frontend = %{version}
%description
@@ -64,29 +72,65 @@
and let the computer take care of the rest.
+%package qt
+Summary: Lyx graphical frontend using Qt
+Group: Applications/Publishing
+Requires: %{name} = %{version}
+Provides: %{name}-frontend = %{version}-%{release}
+%description qt
+%{summary}.
+
+%package xforms
+Summary: Lyx graphical frontend using XForms
+Group: Applications/Publishing
+Requires: %{name} = %{version}
+Provides: %{name}-frontend = %{version}-%{release}
+%description xforms
+%{summary}.
+
+
%prep
%setup -q
%patch1 -p1 -b .helpers
+%patch2 -p1 -b .noxfonts
+
+# ./autogen.sh
%build
-test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
unset LINGUAS ||:
+# QT
+test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
%{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" }
-
%configure \
--with-frontend=qt \
--enable-optimization="$RPM_OPT_FLAGS" \
--with-aiksaurus \
--with-pspell \
- --disable-dependency-tracking
+ --without-warnings --disable-debug --disable-dependency-tracking
+
+make %{?_smp_mflags}
+cp -a src/lyx lyx-qt
+
+# Intermediate cleanup
+# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking
+make -C src/frontends clean
+
+# XFORMS
+%configure \
+ --with-frontend=xforms \
+ --enable-optimization="$RPM_OPT_FLAGS" \
+ --with-aiksaurus \
+ --with-pspell \
+ --without-warnings --disable-debug --disable-dependency-tracking
make %{?_smp_mflags}
+cp -a src/lyx lyx-xforms
%install
@@ -94,38 +138,42 @@
unset LINGUAS ||:
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+## Handle front-ends
+install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx
+install -p -m0755 -D lyx-qt $RPM_BUILD_ROOT%{_bindir}/lyx-qt
+install -p -m0755 -D lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms
+
-#
# 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
-
-# KDE already has a nice builtin crystalsvg icon, but this is for gnome's benefit
-install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
+mkdir -p $RPM_BUILD_ROOT${texmf}/tex/latex
+mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \
+ $RPM_BUILD_ROOT${texmf}/tex/latex/lyx
+
+# KDE already has a nice builtin crystalsvg icon,
+# but this is for gnome's benefit (gtk2 < 2.6)
+install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category "X-Fedora" \
- %{SOURCE1}
+ %{SOURCE21} %{SOURCE22}
%find_lang %{name} || touch %{name}.lang
-touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr
+#touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr
%post
-# Make TeX understand where LyX-specific packages are
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
texhash >& /dev/null ||:
-# Now configure LyX
cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null
%postun
-# Fix the TeX file hash
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
texhash >& /dev/null ||:
# Catch installed/uninstalled helpers
@@ -145,22 +193,45 @@
%files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc ANNOUNCE ChangeLog lib/CREDITS NEWS README
-%{_datadir}/applications/*.desktop
+%{_bindir}/lyx
+%{_bindir}/noweb2lyx
+%{_bindir}/reLyX
+#{_datadir}/applications/*-lyx.desktop
%{_datadir}/pixmaps/*
-%{_bindir}/*
%{_mandir}/man?/*
-%{_datadir}/%{name}
-%verify(not md5 size mtime) %{_datadir}/%{name}/*.lst
-%verify(not md5 size mtime) %{_datadir}/%{name}/lyxrc.defaults
-%verify(not md5 size mtime) %{_datadir}/%{name}/doc/LaTeXConfig.lyx
-%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/PSres.upr
-%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/fonts.*
-%{_datadir}/texmf/tex/latex/%{name}
+%{_datadir}/lyx/
+%{_datadir}/texmf/tex/latex/lyx/
+%verify(not md5 size mtime) %{_datadir}/lyx/*.lst
+%verify(not md5 size mtime) %{_datadir}/lyx/lyxrc.defaults
+%verify(not md5 size mtime) %{_datadir}/lyx/doc/LaTeXConfig.lyx
+
+%files qt
+%defattr(-,root,root,-)
+%{_bindir}/lyx-qt
+%{_datadir}/applications/*-lyx-qt.desktop
+
+%files xforms
+%defattr(-,root,root,-)
+%{_bindir}/lyx-xforms
+%{_datadir}/applications/*-lyx-xforms.desktop
+
+
+%changelog
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-3
+- cleanup/fix snarfing of intermediate frontend builds.
+
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
+- BR: libXpm-devel
+
+* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
+- 1.3.7
+- -qt/-xforms: frontend pkgs (#178116)
+* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-5
+- %%post/%%postun: update-desktop-database
-%changelog
* Fri Sep 02 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-4
- leave out kde-redhat bits in Fedora Extras build
- define/use safer (esp for x86_64) QTDIR bits
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 5 Aug 2005 18:39:46 -0000 1.4
+++ sources 20 Jan 2006 17:51:39 -0000 1.5
@@ -1 +1 @@
-20fd8515cc025129d97232dd2583f35f lyx-1.3.6.tar.gz
+cef9a2fca128c32ffa04c214d02cde04 lyx-1.3.7.tar.bz2
--- find_helpers.sh DELETED ---
--- lyx-1.3.5-helpers.patch DELETED ---
More information about the fedora-extras-commits
mailing list