rpms/lyx/devel lyx-1.4.0-helpers.patch, NONE, 1.1 lyx.spec, 1.16, 1.17 lyx-1.3.7-helpers.patch, 1.1, NONE lyx-1.3.7-noxfonts.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Jan 26 18:01:08 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7370
Modified Files:
lyx.spec
Added Files:
lyx-1.4.0-helpers.patch
Removed Files:
lyx-1.3.7-helpers.patch lyx-1.3.7-noxfonts.patch
Log Message:
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.1.pre3
- 1.4.0pre3
lyx-1.4.0-helpers.patch:
--- NEW FILE lyx-1.4.0-helpers.patch ---
--- lyx-1.4.0pre3/lib/configure.helpers 2005-12-24 03:57:10.000000000 -0600
+++ lyx-1.4.0pre3/lib/configure 2006-01-23 07:29:27.000000000 -0600
@@ -811,7 +811,7 @@
echo $ac_n "checking for a Postscript previewer""... $ac_c"
echo "$ac_t"""
PS_VIEWER=
-for ac_prog in gsview32 gv "ghostview -swap" kghostview
+for ac_prog in evince gsview32 gsview kghostview ggv gv "ghostview -swap"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog ; ac_word=$2
@@ -849,7 +849,7 @@
echo $ac_n "checking for a PDF previewer""... $ac_c"
echo "$ac_t"""
PDF_VIEWER=
-for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview
+for ac_prog in acrobat acrord32 acroread evince xpdf gsview32 gsview kpdf kghostview ggv 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
@@ -923,7 +923,7 @@
echo $ac_n "checking for a HTML previewer""... $ac_c"
echo "$ac_t"""
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.4.0pre3/lib/configure.m4.helpers 2005-09-08 04:20:12.000000000 -0500
+++ lyx-1.4.0pre3/lib/configure.m4 2006-01-23 07:27:26.000000000 -0600
@@ -286,17 +286,17 @@
SEARCH_PROG([for a LaTeX -> OpenOffice.org converter],latex_to_sxw_command, "oolatex \$\$i" "oolatex.sh \$\$i")
# Search something to preview postscript
-SEARCH_PROG([for a Postscript previewer],PS_VIEWER,gsview32 gv "ghostview -swap" kghostview)
+SEARCH_PROG([for a Postscript previewer],PS_VIEWER,evince gsview32 gsview kghostview ggv gv "ghostview -swap")
EPS_VIEWER=$PS_VIEWER
# 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, acrobat acrord32 acroread evince xpdf gsview32 gsview kpdf kghostview ggv gv ghostview)
# Search something to preview dvi
-SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi)
+SEARCH_PROG([for a DVI previewer],DVI_VIEWER, kdvi xdvi windvi yap)
# Search something to preview html
-SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape)
+SEARCH_PROG([for a 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")
Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lyx.spec 20 Jan 2006 16:08:32 -0000 1.16
+++ lyx.spec 26 Jan 2006 18:01:08 -0000 1.17
@@ -1,17 +1,18 @@
+%define beta pre3
+
Summary: WYSIWYM (What You See Is What You Mean) document processor
Name: lyx
-Version: 1.3.7
-Release: 2%{?dist}
+Version: 1.4.0
+Release: 0.1.%{beta}%{?dist}
License: GPL
Group: Applications/Publishing
Url: http://www.lyx.org/
-Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
+Source: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-1.4.0pre3.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: lyx-1.3.7-helpers.patch
-Patch2: lyx-1.3.7-noxfonts.patch
+Patch1: lyx-1.4.0-helpers.patch
# app-wrapper for various frontends
Source10: lyx.sh
@@ -32,13 +33,15 @@
# xforms frontend
BuildRequires: xforms-devel
BuildRequires: libjpeg-devel
-%if "{?fedora}" > "4"
+%if "%{?fedora}" > "4"
BuildRequires: libXpm-devel
%endif
BuildRequires: desktop-file-utils
+BuildRequires: python
BuildRequires: aiksaurus-devel
BuildRequires: aspell-devel
+BuildRequires: zlib-devel
BuildRequires: tetex-latex
BuildRequires: tetex-fonts
@@ -91,60 +94,50 @@
%prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?beta}
%patch1 -p1 -b .helpers
-%patch2 -p1 -b .noxfonts
# ./autogen.sh
%build
-unset LINGUAS ||:
-
# QT
-test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /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" }
+
+for frontend in qt xforms ; do
+
%configure \
- --with-frontend=qt \
+ --disable-rpath \
+ --enable-compression-support \
+ --with-frontend=$frontend \
--enable-optimization="$RPM_OPT_FLAGS" \
--with-aiksaurus \
- --with-pspell \
+ --with-aspell \
--without-warnings --disable-debug --disable-dependency-tracking
-make %{?_smp_mflags} && \
- cp -a src/lyx lyx-qt
+#--with-included-boost
-# Intermediate cleanup
+# 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}
-make %{?_smp_mflags} && \
-cp -a src/lyx lyx-xforms
+done
%install
rm -rf $RPM_BUILD_ROOT
-unset LINGUAS ||:
-
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
-
+install -p -m0755 -D src/lyx-qt $RPM_BUILD_ROOT%{_bindir}/lyx-qt
+install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms
# Set up the lyx-specific class files where TeX can see them
texmf=%{_datadir}/texmf
@@ -154,7 +147,7 @@
# 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
+#install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
@@ -168,12 +161,12 @@
%post
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-texhash >& /dev/null ||:
-cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+texhash > /dev/null 2>&1 ||:
+cd %{_datadir}/lyx && ./configure
%postun
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
texhash >& /dev/null ||:
# Catch installed/uninstalled helpers
@@ -196,11 +189,11 @@
%defattr(-,root,root,-)
%doc ANNOUNCE ChangeLog lib/CREDITS NEWS README
%{_bindir}/lyx
-%{_bindir}/noweb2lyx
-%{_bindir}/reLyX
+%{_bindir}/lyxclient
+%{_bindir}/tex2lyx
#{_datadir}/applications/*-lyx.desktop
-%{_datadir}/pixmaps/*
-%{_mandir}/man?/*
+#{_datadir}/pixmaps/*
+%{_mandir}/man1/*
%{_datadir}/lyx/
%{_datadir}/texmf/tex/latex/lyx/
%verify(not md5 size mtime) %{_datadir}/lyx/*.lst
@@ -219,6 +212,12 @@
%changelog
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.1.pre3
+- 1.4.0pre3
+
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-4
+- 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
--- lyx-1.3.7-helpers.patch DELETED ---
--- lyx-1.3.7-noxfonts.patch DELETED ---
More information about the fedora-extras-commits
mailing list