rpms/lyx/devel lyx-1.5.4-xdg_open.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 lyx.spec, 1.66, 1.67 sources, 1.24, 1.25
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Feb 26 18:12:48 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9118
Modified Files:
.cvsignore lyx.spec sources
Added Files:
lyx-1.5.4-xdg_open.patch
Log Message:
* Mon Feb 25 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5.4-1
- lyx-1.5.4 (#434689)
- reintroduce xdg-utils patch (reverted upstream).
- omit bakoma ttf fonts
lyx-1.5.4-xdg_open.patch:
--- NEW FILE lyx-1.5.4-xdg_open.patch ---
diff -up lyx-1.5.4/lib/configure.py.xdg_open lyx-1.5.4/lib/configure.py
--- lyx-1.5.4/lib/configure.py.xdg_open 2008-01-08 08:22:29.000000000 -0600
+++ lyx-1.5.4/lib/configure.py 2008-02-25 17:06:20.000000000 -0600
@@ -244,7 +244,7 @@ def checkFormatEntries(dtl_tools):
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-remote', 'gimp'])
+ path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'])
path, ie = checkViewer('a raster image editor', ['gimp-remote', 'gimp'])
addToRC(r'''\Format bmp bmp BMP "" "%s" "%s" ""
\Format gif gif GIF "" "%s" "%s" ""
@@ -279,29 +279,29 @@ def checkFormatEntries(dtl_tools):
#
#checkProg('a Postscript interpreter', ['gs'],
# rc_entry = [ r'\ps_command "%%"' ])
- checkViewer('a Postscript previewer', ['kghostview', 'evince', 'gv', 'ghostview -swap'],
+ checkViewer('a Postscript previewer', ['xdg-open', 'kghostview', 'evince', 'gv', 'ghostview -swap'],
rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector"
\Format ps ps Postscript t "%%" "" "document,vector"'''])
#
- checkViewer('a PDF previewer', ['kpdf', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
+ checkViewer('a PDF previewer', ['xdg-open', 'kpdf', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
'gv', 'ghostview'],
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 "" "" "" "vector"')
#
- checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+ checkViewer('an HTML previewer', ['xdg-open', 'htmlview', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
rc_entry = [r'\Format html html HTML H "%%" "" "document"'])
#
checkViewer('Noteedit', ['noteedit'],
rc_entry = [r'\Format noteedit not Noteedit "" "%%" "%%" "vector"'])
#
- checkViewer('an OpenDocument viewer', ['oowriter'],
+ checkViewer('an OpenDocument viewer', ['xdg-open', 'oowriter'],
rc_entry = [r'\Format odt odt OpenDocument "" "%%" "%%" "document,vector"'])
#
# entried that do not need checkProg
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 17 Dec 2007 14:09:24 -0000 1.26
+++ .cvsignore 26 Feb 2008 18:11:57 -0000 1.27
@@ -1,3 +1 @@
-clog
-lyx-1.5.2.tar.bz2
-lyx-1.5.3.tar.bz2
+lyx-1.5.4.tar.bz2
Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- lyx.spec 11 Feb 2008 12:03:06 -0000 1.66
+++ lyx.spec 26 Feb 2008 18:11:57 -0000 1.67
@@ -1,8 +1,8 @@
Summary: WYSIWYM (What You See Is What You Mean) document processor
Name: lyx
-Version: 1.5.3
-Release: 2%{?dist}
+Version: 1.5.4
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Publishing
@@ -10,6 +10,8 @@
Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: lyx-1.5.4-xdg_open.patch
+
Source1: lyxrc.dist
Source10: lyx.desktop
@@ -21,8 +23,6 @@
BuildRequires: gettext
BuildRequires: python
BuildRequires: qt4-devel
-BuildRequires: tetex-latex
-BuildRequires: tetex-fonts
BuildRequires: zlib-devel
Obsoletes: %{name}-qt < %{version}-%{release}
@@ -32,15 +32,13 @@
Requires(post): %{_bindir}/texhash
Requires(postun): %{_bindir}/texhash
-## FIXME/TODO: adapt to texlive,
-## but wait until general virtual Provides are available
-#if 0%{?fedora} > 8
-#Requires: texlive-latex
-#Requires: texlive-dvips
-#else
-Requires: tetex-latex
-Requires: tetex-dvips
-#endif
+%if 0%{?fedora} > 8
+BuildRequires: tex(dvips) tex(latex) texlive-fonts
+Requires: tex(dvips) tex(latex)
+%else
+BuildRequires: tetex-dvips tetex-latex tetex-fonts
+Requires: tetex-dvips tetex-latex
+%endif
Requires: mathml-fonts
Requires: ghostscript
## Soft dependencies
@@ -77,6 +75,8 @@
%setup -q -n %{name}-%{version}%{?pre}
+%patch1 -p1 -b .xdg_open
+
%build
@@ -92,33 +92,36 @@
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
# misc/extras
-install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.dist
+install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/lyx/lyxrc.dist
# Set up the lyx-specific class files where TeX can see them
texmf=%{_datadir}/texmf
-mkdir -p $RPM_BUILD_ROOT${texmf}/tex/latex
-mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \
- $RPM_BUILD_ROOT${texmf}/tex/latex/lyx
+mkdir -p %{buildroot}${texmf}/tex/latex
+mv %{buildroot}%{_datadir}/lyx/tex \
+ %{buildroot}${texmf}/tex/latex/lyx
# .desktop
desktop-file-install \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --dir %{buildroot}%{_datadir}/applications \
--vendor="" \
%{SOURCE10}
-# generic/hicolor icon
+# icon
install -p -D -m644 lib/images/lyx.xpm \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/lyx.xpm
+ %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/lyx.xpm
# ghost'd files
-touch $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.defaults
-touch $RPM_BUILD_ROOT%{_datadir}/lyx/{packages,textclass}.lst
-touch $RPM_BUILD_ROOT%{_datadir}/lyx/doc/LaTeXConfig.lyx
+touch %{buildroot}%{_datadir}/lyx/lyxrc.defaults
+touch %{buildroot}%{_datadir}/lyx/{packages,textclass}.lst
+touch %{buildroot}%{_datadir}/lyx/doc/LaTeXConfig.lyx
+
+# unpackaged files
+rm -rf %{buildroot}%{_datadir}/lyx/fonts
%find_lang %{name}
@@ -152,7 +155,7 @@
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files -f %{name}.lang
@@ -171,6 +174,11 @@
%changelog
+* Mon Feb 25 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5.4-1
+- lyx-1.5.4 (#434689)
+- reintroduce xdg-utils patch (reverted upstream).
+- omit bakoma ttf fonts
+
* Mon Feb 11 2008 José Matos <jamatos[AT]fc.up.pt> - 1.5.3-2
- Rebuild for gcc 4.3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 17 Dec 2007 14:09:24 -0000 1.24
+++ sources 26 Feb 2008 18:11:57 -0000 1.25
@@ -1 +1 @@
-4fe013248713bb126877c317cad57238 lyx-1.5.3.tar.bz2
+6f424dc23af78e1d39c6962101cde2e9 lyx-1.5.4.tar.bz2
More information about the fedora-extras-commits
mailing list