rpms/lyx/FC-3 lyx-1.3.7-helpers.patch, NONE, 1.1 lyx-1.3.7-noxfonts.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 lyx.desktop, 1.2, 1.3 lyx.spec, 1.10, 1.11 sources, 1.4, 1.5 find_helpers.sh, 1.1, NONE lyx-1.3.5-helpers.patch, 1.3, NONE

Fri Feb 17 12:49:03 UTC 2006

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28535

Modified Files:
	.cvsignore lyx.desktop lyx.spec sources 
Added Files:
	lyx-1.3.7-helpers.patch lyx-1.3.7-noxfonts.patch 
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-5
- cleanup/fix snarfing of intermediate frontend builds.


lyx-1.3.7-helpers.patch:

--- NEW FILE lyx-1.3.7-helpers.patch ---
--- lyx-1.3.7/lib/configure.m4.helpers	2006-01-11 10:32:15.000000000 -0600
+++ lyx-1.3.7/lib/configure.m4	2006-01-17 11:55:31.000000000 -0600
@@ -269,7 +269,7 @@
 test $image_command = "convert" && image_command="convert \$\$i \$\$o"
 
 # Search something to preview postscript
-SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gsview32 gv ghostview kghostview)
+SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,evince gsview32 gsview ggv kghostview gv ghostview)
 case $GHOSTVIEW in
   ghostview) PS_VIEWER="$GHOSTVIEW -swap" ;;
   *) PS_VIEWER="$GHOSTVIEW";;
@@ -277,13 +277,13 @@
 EPS_VIEWER=$GHOSTVIEW
 
 # Search for a program to preview pdf
-SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)
+SEARCH_PROG([for a PDF previewer],PDF_VIEWER, evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview)
 
 # Search something to preview dvi
 SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi)
 
 # Search something to preview html
-SEARCH_PROG([for an HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape)
+SEARCH_PROG([for an HTML previewer],HTML_VIEWER, "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)
 
 # Search for a program to convert ps to pdf
 SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i")
--- lyx-1.3.7/lib/configure.helpers	2006-01-16 08:51:48.000000000 -0600
+++ lyx-1.3.7/lib/configure	2006-01-17 12:00:54.000000000 -0600
@@ -478,9 +478,9 @@
 
 # Search something to preview postscript
 echo $ac_n "checking for a Postscript previewer""... $ac_c"
-echo "$ac_t""(gsview32 gv ghostview kghostview)"
+echo "$ac_t""(evince gsview32 gsview ggv kghostview gv ghostview)"
 GHOSTVIEW=
-for ac_prog in gsview32 gv ghostview kghostview
+for ac_prog in evince gsview32 gsview ggv kghostview gv ghostview
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -519,9 +519,9 @@
 
 # Search for a program to preview pdf
 echo $ac_n "checking for a PDF previewer""... $ac_c"
-echo "$ac_t""(acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)"
+echo "$ac_t""(evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview)"
 PDF_VIEWER=
-for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview
+for ac_prog in evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -591,9 +591,9 @@
 
 # Search something to preview html
 echo $ac_n "checking for an HTML previewer""... $ac_c"
-echo "$ac_t""("mozilla file://\$\$p\$\$i" netscape)"
+echo "$ac_t""("htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)"
 HTML_VIEWER=
-for ac_prog in "mozilla file://\$\$p\$\$i" netscape
+for ac_prog in "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2

lyx-1.3.7-noxfonts.patch:

--- NEW FILE lyx-1.3.7-noxfonts.patch ---
--- lyx-1.3.7/lib/configure.noxfonts	2006-01-17 12:00:54.000000000 -0600
+++ lyx-1.3.7/lib/configure	2006-01-17 12:14:49.000000000 -0600
@@ -1610,6 +1610,8 @@
 EOF
 fi
 
+## DISABLED (by default), rely on already-present mathml-fonts
+if [ "x${use_xfonts}" == "xtrue"]; then 
 ######## X FONTS
 # create a fonts.dir file to make X fonts available to LyX
 echo "checking for TeX fonts"
@@ -1643,6 +1645,7 @@
   (cd xfonts ; rm -f PSres.upr ; makepsres) 2>/dev/null || true
 fi
 rm -f xfonts/tmpfonts
+fi
 
 
 # Remove superfluous files if we are not writing in the main lib
--- lyx-1.3.7/lib/configure.m4.noxfonts	2006-01-17 11:55:31.000000000 -0600
+++ lyx-1.3.7/lib/configure.m4	2006-01-17 12:14:31.000000000 -0600
@@ -676,7 +676,9 @@
 EOF
 fi
 
-######## X FONTS
+## DISABLED (by default), rely on already-present mathml-fonts
+if [ "x${use_xfonts}" == "xtrue"]; then
+######## X FONTS 
 # create a fonts.dir file to make X fonts available to LyX
 echo "checking for TeX fonts"
 
@@ -709,6 +711,7 @@
   (cd xfonts ; rm -f PSres.upr ; makepsres) 2>/dev/null || true
 fi
 rm -f xfonts/tmpfonts
+fi
 
 
 # Remove superfluous files if we are not writing in the main lib


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-3/.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	17 Feb 2006 12:49:03 -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-3/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	17 Feb 2006 12:49:03 -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-3/lyx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lyx.spec	2 Sep 2005 12:16:20 -0000	1.10
+++ lyx.spec	17 Feb 2006 12:49:03 -0000	1.11
@@ -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: 5%{?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-5
+- 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-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Aug 2005 19:42:29 -0000	1.4
+++ sources	17 Feb 2006 12:49:03 -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 ---


