rpms/lyx/FC-4 lyx-1.4.0-helpers.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 helpers.sh, 1.1, 1.2 lyx.spec, 1.16, 1.17 sources, 1.5, 1.6 lyx-1.3.7-helpers.patch, 1.1, NONE lyx-1.3.7-noxfonts.patch, 1.1, NONE lyx-crystal.png, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Mar 10 18:51:26 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv954
Modified Files:
.cvsignore helpers.sh lyx.spec sources
Added Files:
lyx-1.4.0-helpers.patch
Removed Files:
lyx-1.3.7-helpers.patch lyx-1.3.7-noxfonts.patch
lyx-crystal.png
Log Message:
sync w/devel branch (lyx-1.4.0)
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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 20 Jan 2006 17:51:39 -0000 1.3
+++ .cvsignore 10 Mar 2006 18:51:26 -0000 1.4
@@ -1 +1,2 @@
-lyx-1.3.7.tar.bz2
+lyx-1.4.0.tar.bz2
+beamer.layout
Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lyx.spec 20 Jan 2006 18:43:46 -0000 1.16
+++ lyx.spec 10 Mar 2006 18:51:26 -0000 1.17
@@ -1,29 +1,28 @@
Summary: WYSIWYM (What You See Is What You Mean) document processor
Name: lyx
-Version: 1.3.7
-Release: 5%{?dist}
+Version: 1.4.0
+Release: 4%{?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-%{version}%{?beta}.tar.bz2
+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.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
-
+# .desktop files
Source20: lyx.desktop
Source21: lyx-qt.desktop
Source22: lyx-xforms.desktop
+# misc
+Source100: ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/beamer/lyx/layouts/beamer.layout
-# "borrow" kde's crystal icon for lyx
-Source30: lyx-crystal.png
-
-# TODO: use this find_helpers.sh script at runtime, instead of depending on
+# TODO: use helpers.sh script at runtime, instead of depending on
# lyx's configure and %%triggers
#Source100: helpers.sh
@@ -31,14 +30,12 @@
BuildRequires: qt-devel
# xforms frontend
BuildRequires: xforms-devel
-BuildRequires: libjpeg-devel
-%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 +88,55 @@
%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
-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 \
- --without-warnings --disable-debug --disable-dependency-tracking
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-make %{?_smp_mflags}
-cp -a src/lyx lyx-qt
+# drop -fexceptions from optflags, suggested by lyx devs:
+# http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg85794.html
+optflags="$(echo %optflags | sed -e 's|-fexceptions||' )"
+%global optflags $optflags
-# Intermediate cleanup
-# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking
-make -C src/frontends clean
+for frontend in qt xforms ; do
-# XFORMS
%configure \
- --with-frontend=xforms \
- --enable-optimization="$RPM_OPT_FLAGS" \
+ --disable-rpath \
+ --enable-compression-support \
+ --with-frontend=$frontend \
+ --enable-optimization="%{optflags}" \
--with-aiksaurus \
- --with-pspell \
- --without-warnings --disable-debug --disable-dependency-tracking
+ --with-aspell \
+ --without-warnings --disable-dependency-tracking \
+ --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \
+
+# Intermediate cleanup
+# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking
+make -C src/frontends clean
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 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx
+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
+# misc/extras
+install -p -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/lyx/layouts/
# Set up the lyx-specific class files where TeX can see them
texmf=%{_datadir}/texmf
@@ -152,10 +144,6 @@
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 \
@@ -164,27 +152,25 @@
%find_lang %{name} || touch %{name}.lang
-#touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr
-
%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 > /dev/null 2>&1 ||:
%postun
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-texhash >& /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+texhash > /dev/null 2>&1 ||:
# Catch installed/uninstalled helpers
%triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv
if [ $2 -gt 1 ]; then
-cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null
+cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||:
fi
%triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv
if [ $2 -eq 0 ]; then
-cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null
+cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||:
fi
@@ -196,11 +182,9 @@
%defattr(-,root,root,-)
%doc ANNOUNCE ChangeLog lib/CREDITS NEWS README
%{_bindir}/lyx
-%{_bindir}/noweb2lyx
-%{_bindir}/reLyX
-#{_datadir}/applications/*-lyx.desktop
-%{_datadir}/pixmaps/*
-%{_mandir}/man?/*
+%{_bindir}/lyxclient
+%{_bindir}/tex2lyx
+%{_mandir}/man1/*
%{_datadir}/lyx/
%{_datadir}/texmf/tex/latex/lyx/
%verify(not md5 size mtime) %{_datadir}/lyx/*.lst
@@ -219,7 +203,48 @@
%changelog
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-5
+* Thu Mar 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-4
+- fix stripping of -fexceptions from %%optflags
+
+* Wed Mar 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-3
+- include beamer.layout
+
+* Wed Mar 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-2
+- 1.4.0(final)
+- drop boost bits
+
+* Tue Mar 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.12.rc
+- 1.4.0rc
+- drop boost patch (for now)
+
+* Fri Mar 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.11.pre6
+- 1.4.0pre6
+- --disable-stdlib-debug --disable-assertions --disable-concept-checks
+- don't use --without-included-boost (for now)
+
+* Mon Feb 20 2006 Rex Dieter <rexdieter[AT]usres.sf.net> 1.4.0-0.10.pre5
+- gcc41 patch
+- document boost/gcc41 patches
+- avoid --without-included-boost on fc4/gcc-4.0.2 (gcc bug)
+
+* Tue Feb 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.9.pre5
+- updated boost patch
+- drop -fexceptions from %%optflags
+
+* Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.7.pre5
+- --without-included-boost
+- BR: boost-devel
+
+* Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.5.pre5
+- 1.4.0pre5
+
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.2.pre4
+- 1.4.0pre4
+
+* 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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 20 Jan 2006 17:51:39 -0000 1.5
+++ sources 10 Mar 2006 18:51:26 -0000 1.6
@@ -1 +1,2 @@
-cef9a2fca128c32ffa04c214d02cde04 lyx-1.3.7.tar.bz2
+5ab37471339ff7dbc8f0c43282746cb0 lyx-1.4.0.tar.bz2
+c906271900a0627d3df2a38ad962a285 beamer.layout
--- lyx-1.3.7-helpers.patch DELETED ---
--- lyx-1.3.7-noxfonts.patch DELETED ---
More information about the fedora-extras-commits
mailing list