rpms/lyx/devel .cvsignore, 1.2, 1.3 lyx-1.3.5-helpers.patch, 1.1, 1.2 lyx.spec, 1.8, 1.9 sources, 1.3, 1.4 lyx-1.3.4-gcc34.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Aug 3 17:51:35 UTC 2005
Author: rdieter
Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14771/devel
Modified Files:
.cvsignore lyx-1.3.5-helpers.patch lyx.spec sources
Removed Files:
lyx-1.3.4-gcc34.patch
Log Message:
auto-import lyx-1.3.6-2 on branch devel from lyx-1.3.6-2.src.rpm
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.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 3 Aug 2005 17:51:33 -0000 1.3
@@ -1 +1 @@
-lyx-1.3.4.tar.bz2
+lyx-1.3.6.tar.gz
lyx-1.3.5-helpers.patch:
Index: lyx-1.3.5-helpers.patch
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx-1.3.5-helpers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-1.3.5-helpers.patch 4 Dec 2004 12:21:23 -0000 1.1
+++ lyx-1.3.5-helpers.patch 3 Aug 2005 17:51:33 -0000 1.2
@@ -5,10 +5,10 @@
# Search something to preview postscript
echo $ac_n "checking for a Postscript previewer""... $ac_c"
-echo "$ac_t""(gsview32 gv ghostview)"
-+echo "$ac_t""(gsview32 gsview ggv kghostview gv ghostview)"
++echo "$ac_t""(evince gsview32 gsview ggv kghostview gv ghostview)"
GHOSTVIEW=
-for ac_prog in gsview32 gv ghostview
-+for ac_prog in gsview32 gsview ggv kghostview gv ghostview
++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
@@ -17,10 +17,10 @@
# Search for a program to preview pdf
echo $ac_n "checking for a PDF preview""... $ac_c"
-echo "$ac_t""(acrobat acrord32 gsview32 acroread gv ghostview xpdf)"
-+echo "$ac_t""(acrobat acrord32 gsview32 gsview acroread xpdf ggv kghostview gv ghostview)"
++echo "$ac_t""(evince acrobat acrord32 acroread gsview32 gsview xpdf ggv kghostview gv ghostview)"
PDF_VIEWER=
-for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf
-+for ac_prog in acrobat acrord32 gsview32 gsview acroread xpdf ggv kghostview gv ghostview
++for ac_prog in evince acrobat acrord32 acroread gsview32 gsview xpdf 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
Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lyx.spec 22 May 2005 23:10:30 -0000 1.8
+++ lyx.spec 3 Aug 2005 17:51:33 -0000 1.9
@@ -1,56 +1,42 @@
# $Id$
Summary: WYSIWYM (What You See Is What You Mean) document processor
-Name: lyx
-Version: 1.3.5
-Release: 5%{?dist_tag}
-
+Name: lyx
+Version: 1.3.6
+Release: 2
License: GPL
-Group: Applications/Publishing
-URL: http://www.lyx.org/
-Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.5.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Patch1: lyx-1.3.5-helpers.patch
+Group: Applications/Publishing
+Url: http://www.lyx.org/
+Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.6.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch1: lyx-1.3.5-helpers.patch
Source1: lyx.desktop
# "borrow" kde's crystal icon for lyx
Source2: lyx-crystal.png
BuildRequires: desktop-file-utils
+BuildRequires: aiksaurus-devel
BuildRequires: aspell-devel
BuildRequires: tetex-latex
BuildRequires: tetex-fonts
-BuildRequires: tetex-xdvi
-BuildRequires: tetex-dvips
-BuildRequires: htmlview
-BuildRequires: gsview
-BuildRequires: wv
# For texhash
-Requires(post): tetex
-Requires(postun): tetex
+Requires(post): tetex-fonts
+Requires(postun): tetex-fonts
Requires: tetex-latex
+Requires: tetex-dvips
Requires: mathml-fonts
-# These are just helper apps, to display ps,pdf,html content
-# not *strictly* required, but what the heck
+Requires: ghostscript
Requires: htmlview
-Requires: gsview
BuildRequires: qt-devel >= 1:3.1
-%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2)
+%define qt_ver %(rpm -q --qf '%%{version}' qt-devel )
Requires: qt >= 1:%{qt_ver}
-## gcc version in use?
-# I *still* build for some rh73 boxes (not sure why (-: ),
-# so I need this -- Rex
-BuildRequires: gcc-c++
-%define gcc_ver %(rpm -q --qf '%%{version}' gcc-c++ )
-%if "%{gcc_ver}" == "2.96"
-%define cxxflags -ftemplate-depth-44
-%endif
-
%description
LyX is a modern approach to writing documents which breaks with the
@@ -78,15 +64,17 @@
%build
-unset LINGUAS ||:
+unset LINGUAS ||:
unset QTDIR ||: ; . /etc/profile.d/qt.sh
-export CXXFLAGS="$RPM_OPT_FLAGS %{?cxxflags}"
+%{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" }
%configure \
- --program-prefix="%{?_program_prefix}" \
--with-frontend=qt \
- --with-pspell
+ --enable-optimization="$RPM_OPT_FLAGS" \
+ --with-aiksaurus \
+ --with-pspell \
+ --disable-dependency-tracking
make %{_smp_mflags}
@@ -106,7 +94,7 @@
mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \
${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx
-# KDE has a nice builtin crystalsvg icon, but this is for gnome
+# KDE 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%{_datadir}/applications
@@ -115,7 +103,7 @@
--add-category "X-Fedora" \
%{SOURCE1}
-%find_lang %{name}
+%find_lang %{name} || touch %{name}.lang
%post
@@ -124,11 +112,21 @@
# Now configure LyX
cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null
-
%postun
# Fix the TeX file hash
texhash >& /dev/null ||:
+# 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
+fi
+
+%triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv
+if [ $2 -eq 0 ]; then
+cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null
+fi
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -141,11 +139,31 @@
%{_datadir}/pixmaps/*
%{_bindir}/*
%{_mandir}/man?/*
-%{_datadir}/%{name}*
+%{_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}
-%changelog
+%changelog
+* Mon Aug 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-2
+- use triggers to configure/unconfigure helper (ps/pdf/html) apps
+
+* Sat Jul 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-1
+- 1.3.6
+
+* Mon May 23 2005 Rex Dieter <rexdieter[At]users.sf.net> 1.3.5-4
+- qt_immodule patch (lyx bug #1830)
+- update -helpers patch to look-for/use evince (rh bug #143992)
+- drop (not-strictly-required) Req's on helper apps
+ htmlview, gsview (rh bug #143992)
+- %%configure: --with-aiksaurus
+- %%configure: --enable-optimization="$$RPM_OPT_FLAGS"
+- %%configure: --disable-dependancy-tracking
+
* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.3.5
- rebuild on all arches
@@ -153,10 +171,16 @@
- rebuilt
* Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-3
-- BR: htmlview
+- BR: htmlview
- Requires: htmlview, gsview (so build-time-detected helper apps are
available at runtime)
+
+* Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.3
+- BR: htmlview
+- Requires: htmlview, gsview (so build-time-detected helper apps are
+ available at runtime)
+
* Wed Oct 20 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.2
- BR: pspell-devel -> aspell-devel
- BR: tetex-* (helper detection, fonts)
@@ -196,7 +220,7 @@
- Categories=Office
* Mon Nov 24 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.3
-- Requires: tetex-latex
+- Requires: tetex-latex
- support MimeType(s): application/x-lyx;text/x-lyx
* Sat Nov 22 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 4 Dec 2004 12:21:23 -0000 1.3
+++ sources 3 Aug 2005 17:51:33 -0000 1.4
@@ -1 +1 @@
-f4c70d2565ba9c974b1f94fc1dfd63bf lyx-1.3.5.tar.bz2
+20fd8515cc025129d97232dd2583f35f lyx-1.3.6.tar.gz
--- lyx-1.3.4-gcc34.patch DELETED ---
More information about the fedora-extras-commits
mailing list