rpms/lyx/FC-3 lyx-1.3.5-helpers.patch, 1.1, 1.2 lyx.spec, 1.5, 1.6 lyx-1.3.4-gcc34.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	lyx-1.3.5-helpers.patch lyx.spec 
Removed Files:
	lyx-1.3.4-gcc34.patch 
Log Message:
sync w/-devel branch


lyx-1.3.5-helpers.patch:

Index: lyx-1.3.5-helpers.patch
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-3/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	5 Aug 2005 18:40:02 -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/FC-3/lyx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lyx.spec	4 Dec 2004 12:21:23 -0000	1.5
+++ lyx.spec	5 Aug 2005 18:40:02 -0000	1.6
@@ -2,14 +2,14 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Epoch:	 0
-Version: 1.3.5 
-Release: 3%{?dist_tag}
+Version: 1.3.6
+Release: 2%{?dist}
 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
+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
 
@@ -18,39 +18,25 @@
 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)
+BuildRequires: qt-devel >= 1:3.3
+%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
@@ -81,12 +67,14 @@
 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,12 +139,44 @@
 %{_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 
+* 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
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-3
+- 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)


--- lyx-1.3.4-gcc34.patch DELETED ---