rpms/lyx/devel lyx-1.5.0beta1-xdg-open.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 lyx.spec, 1.50, 1.51 lyxrc.dist, 1.1, 1.2 sources, 1.15, 1.16 lyx-1.4.4-xdg_open.patch, 1.1, NONE lyx-qt.desktop, 1.3, NONE lyx-xforms.desktop, 1.3, NONE lyx.conf, 1.1, NONE lyx.sh, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Mon Mar 5 13:22:33 UTC 2007 

Author: rdieter

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

Modified Files:
	.cvsignore lyx.spec lyxrc.dist sources 
Added Files:
	lyx-1.5.0beta1-xdg-open.patch 
Removed Files:
	lyx-1.4.4-xdg_open.patch lyx-qt.desktop lyx-xforms.desktop 
	lyx.conf lyx.sh 
Log Message:
* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.2.beta1
- lyx-1.5.0beta1
- tweak lyxrc.dist


lyx-1.5.0beta1-xdg-open.patch:

--- NEW FILE lyx-1.5.0beta1-xdg-open.patch ---
--- lyx-1.5.0beta1/lib/configure.py.xdg_open	2007-02-15 14:14:12.000000000 -0600
+++ lyx-1.5.0beta1/lib/configure.py	2007-02-28 11:43:12.000000000 -0600
@@ -238,7 +238,7 @@
     checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'],
         rc_entry = [r'\Format fen        fen     FEN                    "" "%%"	"%%"	""'])
     #
-    path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp'])
+    path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp'])
     path, ie = checkViewer('a raster image editor', ['gimp'])
     addToRC(r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
 \Format gif        gif     GIF                    "" "%s"	"%s"	""
@@ -273,23 +273,23 @@
     #
     #checkProg('a Postscript interpreter', ['gs'],
     #  rc_entry = [ r'\ps_command "%%"' ])
-    checkViewer('a Postscript previewer', ['gv', 'ghostview -swap', 'kghostview'],
+    checkViewer('a Postscript previewer', ['xdg-open', 'gv', 'ghostview -swap', 'kghostview'],
         rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"vector"
 \Format ps         ps      Postscript             t  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'gv', 'ghostview', \
+    checkViewer('a PDF previewer', ['xdg-open', 'acrobat', 'acroread', 'gv', 'ghostview', \
                             'xpdf', 'kpdf', 'kghostview'],
         rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""	"document,vector"
 \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""	"document,vector"
 \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""	"document,vector"'''])
     #
-    checkViewer('a DVI previewer', ['xdvi', 'kdvi'],
+    checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi'],
         rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""	"document,vector"'])
     if dtl_tools:
         # Windows only: DraftDVI
         addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	"document,vector"')
     #
-    checkViewer('an HTML previewer', ['mozilla file://$$p$$i', 'netscape'],
+    checkViewer('an HTML previewer', ['xdg-open', 'mozilla file://$$p$$i', 'netscape'],
         rc_entry = [r'\Format html       html    HTML                   H  "%%"	""	"document"'])
     #
     checkViewer('Noteedit', ['noteedit'],


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	15 Feb 2007 15:17:45 -0000	1.16
+++ .cvsignore	5 Mar 2007 13:22:00 -0000	1.17
@@ -2,3 +2,4 @@
 beamer.layout
 lyx-1.4.3.tar.bz2
 lyx-1.4.4.tar.bz2
+lyx-1.5.0beta1.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- lyx.spec	15 Feb 2007 15:17:45 -0000	1.50
+++ lyx.spec	5 Mar 2007 13:22:00 -0000	1.51
@@ -1,32 +1,25 @@
 
+%define pre beta1
+
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.4.4
-Release: 2%{?dist}
+Version: 1.5.0
+Release: 0.1.%{pre}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
-Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
+Source0: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Patch1: lyx-1.4.4-xdg_open.patch
+Patch1: lyx-1.5.0beta1-xdg-open.patch 
 
 Source1: lyxrc.dist
-# 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
-
-# qt frontend
-BuildRequires: qt-devel
-# xforms frontend
-BuildRequires: xforms-devel
 
+Source10: lyx.desktop
+
+BuildRequires: qt4-devel
+#BuildRequires: boost-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: python
@@ -36,16 +29,19 @@
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
 
+Obsoletes: %{name}-qt < %{version}-%{release}
+Provides:  %{name}-qt = %{version}-%{release}
+Obsoletes: %{name}-xforms < %{version}
+
 # For texhash
 Requires(post): tetex-fonts
 Requires(postun): tetex-fonts
 
-Requires: %{name}-frontend = %{version}
 Requires: tetex-latex
 Requires: tetex-dvips
 Requires: mathml-fonts
 Requires: ghostscript
-# Short-hand for Requires+Requires(post,postun)
+# Short-hand for Requires,Requires(post,postun)
 Prereq: xdg-utils
 ## Soft dependencies
 %if 0%{?fedora} > 3
@@ -74,36 +70,16 @@
 and let the computer take care of the rest.
 
 
-%package qt 
-Summary: Lyx graphical frontend using Qt
-Group:   Applications/Publishing
-Requires: %{name} = %{version}
-Provides: %{name}-frontend = %{version}-%{release}
-%description qt
-%{summary}.
-
-%package xforms
-Summary: Lyx graphical frontend using XForms
-Group:   Applications/Publishing
-Requires: %{name} = %{version}
-Provides: %{name}-frontend = %{version}-%{release}
-%description xforms
-%{summary}.
-Please note: This frontend is deprecated, and will no longer be included
-in lyx-1.5.x.
-
 
 %prep
 
-%setup -q -n %{name}-%{version}%{?beta}
+%setup -q -n %{name}-%{version}%{?pre}
 
 %patch1 -p1 -b .xdg_open
 
 
 %build
 
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
 # 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||' )"
@@ -111,8 +87,6 @@
 
 %configure \
   --disable-rpath \
-  --enable-compression-support \
-  --with-frontend="qt xforms" \
   --enable-optimization="%{optflags}" \
   --with-aiksaurus \
   --with-aspell \
@@ -127,14 +101,8 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-## Handle front-ends
-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 %{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
 texmf=%{_datadir}/texmf
@@ -146,16 +114,12 @@
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --vendor="" \
-  %{SOURCE21} %{SOURCE22}
+  %{SOURCE10}
 
 # generic/hicolor icon
 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
 touch $RPM_BUILD_ROOT%{_datadir}/lyx/{packages,textclass}.lst
@@ -196,10 +160,9 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ANNOUNCE ChangeLog lib/CREDITS NEWS README
-%{_bindir}/lyx
-%{_bindir}/lyxclient
-%{_bindir}/tex2lyx
+%{_bindir}/*
 %{_mandir}/man1/*
+%{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/lyx/
 %config(noreplace) %{_datadir}/lyx/lyxrc.dist
@@ -208,18 +171,12 @@
 %ghost %{_datadir}/lyx/doc/LaTeXConfig.lyx
 %{_datadir}/texmf/tex/latex/lyx/
 
-%files qt
-%defattr(-,root,root,-)
-%{_bindir}/lyx-qt
-%{_datadir}/applications/*lyx-qt.desktop
-
-%files xforms
-%defattr(-,root,root,-)
-%{_bindir}/lyx-xforms
-%{_datadir}/applications/*lyx-xforms.desktop
-
 
 %changelog
+* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.2.beta1
+- lyx-1.5.0beta1
+- tweak lyxrc.dist
+
 * Thu Feb 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.4-2
 - biffed sources, respin
 


Index: lyxrc.dist
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyxrc.dist,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyxrc.dist	25 Jul 2006 18:08:01 -0000	1.1
+++ lyxrc.dist	5 Mar 2007 13:22:00 -0000	1.2
@@ -170,7 +170,7 @@
 # The screen fonts used to display the text while editing
 # The defaults are:
 \screen_font_roman "Serif"
-\screen_font_sans "Sans"
+\screen_font_sans "Sans Serif"
 \screen_font_typewriter "Monospace"
 
 # For some, this font looks better:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	15 Feb 2007 15:17:45 -0000	1.15
+++ sources	5 Mar 2007 13:22:00 -0000	1.16
@@ -1,2 +1 @@
-c906271900a0627d3df2a38ad962a285  beamer.layout
-2e778eba4191c5f9fb2cafa7901c322c  lyx-1.4.4.tar.bz2
+304271b30a3504bcb90f405aa5956c89  lyx-1.5.0beta1.tar.bz2


--- lyx-1.4.4-xdg_open.patch DELETED ---


--- lyx-qt.desktop DELETED ---


--- lyx-xforms.desktop DELETED ---


--- lyx.conf DELETED ---


--- lyx.sh DELETED ---

More information about the scm-commits mailing list