rpms/lyx/devel lyx-1.4.2-helpers.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 lyx.spec, 1.40, 1.41 sources, 1.12, 1.13 helpers.conf, 1.1, NONE helpers.sh, 1.2, NONE lyx-1.4.1-defaults.patch, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Tue Jul 25 18:05:14 UTC 2006 

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9735

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.4.2-helpers.patch 
Removed Files:
	helpers.conf helpers.sh lyx-1.4.1-defaults.patch 
Log Message:
* Thu Jul 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.2-1
- 1.4.2


lyx-1.4.2-helpers.patch:

--- NEW FILE lyx-1.4.2-helpers.patch ---
--- lyx-1.4.2/lib/configure.py.helpers	2006-07-07 21:53:50.000000000 -0500
+++ lyx-1.4.2/lib/configure.py	2006-07-24 15:10:12.000000000 -0500
@@ -240,17 +240,17 @@
   #
   #checkProg('a Postscript interpreter', ['gs'],
   #  rc_entry = [ r'\ps_command "%%"' ])
-  checkViewer('a Postscript previewer', ['gv', 'ghostview -swap', 'kghostview'],
+  checkViewer('a Postscript previewer', ['evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
     rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""
 \Format ps         ps      Postscript             t  "%%"	""'''])
   #
-  checkViewer('a PDF previewer', ['acrobat', 'acroread', 'gv', 'ghostview', \
-              'xpdf', 'kpdf', 'kghostview'],
+  checkViewer('a PDF previewer', ['acrobat', 'acroread', 'evince', \
+              'xpdf', 'gsview', 'kpdf', 'kghostview', 'gv', 'ghostview'],
     rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""
 \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""
 \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""'''])
   #
-  checkViewer('a DVI previewer', ['xdvi', 'kdvi'],
+  checkViewer('a DVI previewer', ['kdvi', 'xdvi'],
     rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""'])
   if ((os.name == 'nt' or sys.platform == 'cygwin') and
       checkProg('DVI to DTL converter', ['dv2dt']) != ['', ''] and
@@ -258,7 +258,7 @@
     # Windows only: DraftDVI
     addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""')
   #
-  checkViewer('a HTML previewer', ['mozilla file://$$p$$i', 'netscape'],
+  checkViewer('a HTML previewer', ['htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
     rc_entry = [r'\Format html       html    HTML                   H  "%%"	""'])
   #
   # entried that do not need checkProg


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	15 Jun 2006 18:33:41 -0000	1.13
+++ .cvsignore	25 Jul 2006 18:05:14 -0000	1.14
@@ -1,3 +1,3 @@
 clog
 beamer.layout
-lyx-1.4.1.tar.bz2
+lyx-1.4.2.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- lyx.spec	28 Jun 2006 16:49:16 -0000	1.40
+++ lyx.spec	25 Jul 2006 18:05:14 -0000	1.41
@@ -1,8 +1,8 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.4.1
-Release: 9%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -10,10 +10,9 @@
 Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Patch1: lyx-1.4.0-helpers.patch
-Patch2: lyx-1.4.1-defaults.patch
+Patch1: lyx-1.4.2-helpers.patch
 
-Source1: lyxrc.defaults.custom
+Source1: lyxrc.dist
 # app-wrapper for various frontends
 Source10: lyx.sh
 # .desktop files
@@ -23,10 +22,6 @@
 # misc
 Source100: ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/beamer/lyx/layouts/beamer.layout
 
-# TODO: use helpers.sh script at runtime, instead of depending on
-# lyx's configure and %%triggers
-#Source100: helpers.sh
-
 # qt frontend
 BuildRequires: qt-devel
 # xforms frontend
@@ -99,15 +94,14 @@
 
 %setup -q -n %{name}-%{version}%{?beta}
 
+# FIXME
 %patch1 -p1 -b .helpers
-%patch2 -p1 -b .defaults
 
 
 %build
 
 # QT
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 # drop -fexceptions from optflags, suggested by lyx devs:
 # http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg85794.html
@@ -138,7 +132,7 @@
 install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms
 
 # misc/extras
-install -p -m644 %{SOURCE1}   $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.defaults.custom
+install -p -m644 %{SOURCE1}   $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.dist
 install -p -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/lyx/layouts/
 
 # Set up the lyx-specific class files where TeX can see them
@@ -157,6 +151,13 @@
 install -p -D -m644 lib/images/lyx.xpm \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/lyx.xpm
 
+# configure renamed to configure.py recently, make symlink to
+# old location
+ln -s configure.py $RPM_BUILD_ROOT%{_datadir}/lyx/configure
+
+# ghost'd files
+touch $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.defaults
+
 %find_lang %{name}
 
 
@@ -165,7 +166,7 @@
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
 texhash > /dev/null 2>&1 ||:
-cd %{_datadir}/lyx && ./configure  > /dev/null 2>&1 ||:
+cd %{_datadir}/lyx && ./configure.py  > /dev/null 2>&1 ||:
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor ||:
@@ -176,12 +177,12 @@
 # Catch installed/uninstalled helpers
 %triggerin -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv
 if [ $2 -gt 1 ]; then
-cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: 
+cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||: 
 fi
 
 %triggerun -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv
 if [ $2 -eq 0 ]; then
-cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||:
+cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||:
 fi
 
 
@@ -198,10 +199,8 @@
 %{_mandir}/man1/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/lyx/
-%config(noreplace) %{_datadir}/lyx/lyxrc.defaults.custom
-%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
+%ghost %{_datadir}/lyx/lyxrc.defaults
+%config(noreplace) %{_datadir}/lyx/lyxrc.dist
 %{_datadir}/texmf/tex/latex/lyx/
 
 %files qt
@@ -216,6 +215,9 @@
 
 
 %changelog
+* Thu Jul 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.2-1
+- 1.4.2
+
 * Wed Jun 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-9
 - Requires(hint): wv (bug #193858)
 - fix dependancy -> dependency
@@ -238,6 +240,7 @@
   screen_font_typewriter "Monospace"
   screen_zoom 100
   serverpipe "~/.lyx/pipe"
+  (bug #192253)
 
 * Mon May 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-5
 - Requires(hint): tetex-preview


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	11 Apr 2006 14:35:26 -0000	1.12
+++ sources	25 Jul 2006 18:05:14 -0000	1.13
@@ -1,2 +1,2 @@
 c906271900a0627d3df2a38ad962a285  beamer.layout
-368696695a05e428773626e3b0f8ae74  lyx-1.4.1.tar.bz2
+e828dbb01e3a05b1ae9dfb28884463e2  lyx-1.4.2.tar.bz2


--- helpers.conf DELETED ---


--- helpers.sh DELETED ---


--- lyx-1.4.1-defaults.patch DELETED ---

More information about the fedora-extras-commits mailing list