From e0ad93c3353585ba36f4ba0dbf0c4e4df6aa6298 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Aug 22 2009 18:07:28 +0000 Subject: - lyx-1.6.4 - handle fonts manually (now EPEL-5 compatible) --- diff --git a/.cvsignore b/.cvsignore index 897d655..9ff0935 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lyx-1.6.3.tar.bz2 +lyx-1.6.4.tar.bz2 diff --git a/lyx-1.6.3-xdg_open.patch b/lyx-1.6.3-xdg_open.patch deleted file mode 100644 index 9991b4b..0000000 --- a/lyx-1.6.3-xdg_open.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up lyx-1.6.3/lib/configure.py.xdg_open lyx-1.6.3/lib/configure.py ---- lyx-1.6.3/lib/configure.py.xdg_open 2009-06-02 10:37:29.000000000 -0500 -+++ lyx-1.6.3/lib/configure.py 2009-06-04 11:48:44.794153432 -0500 -@@ -264,7 +264,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" "" -@@ -307,29 +307,29 @@ def checkFormatEntries(dtl_tools): - # - #checkProg('a Postscript interpreter', ['gs'], - # rc_entry = [ r'\ps_command "%%"' ]) -- checkViewer('a Postscript previewer', ['kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'], -+ checkViewer('a Postscript previewer', ['xdg-open', 'kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'], - rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" - \Format ps ps Postscript t "%%" "" "document,vector"''']) - # -- checkViewer('a PDF previewer', ['kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \ -+ checkViewer('a PDF previewer', ['xdg-open', 'kpdf', 'okular', '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', 'okular'], -+ checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular'], - 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', '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', ['swriter', 'oowriter'], -+ checkViewer('an OpenDocument viewer', ['xdg-open', 'swriter', 'oowriter'], - rc_entry = [r'\Format odt odt OpenDocument "" "%%" "%%" "document,vector"']) - # - # entried that do not need checkProg diff --git a/lyx-1.6.4-xdg_open.patch b/lyx-1.6.4-xdg_open.patch new file mode 100644 index 0000000..229c9c1 --- /dev/null +++ b/lyx-1.6.4-xdg_open.patch @@ -0,0 +1,40 @@ +diff -up lyx-1.6.4/lib/configure.py.xdg_open lyx-1.6.4/lib/configure.py +--- lyx-1.6.4/lib/configure.py.xdg_open 2009-08-13 07:16:07.000000000 -0500 ++++ lyx-1.6.4/lib/configure.py 2009-08-22 08:56:01.332263836 -0500 +@@ -264,7 +264,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" "" +@@ -307,23 +307,23 @@ def checkFormatEntries(dtl_tools): + # + #checkProg('a Postscript interpreter', ['gs'], + # rc_entry = [ r'\ps_command "%%"' ]) +- checkViewer('a Postscript previewer', ['kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'], ++ checkViewer('a Postscript previewer', ['xdg-open', 'okular', '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', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \ ++ checkViewer('a PDF previewer', ['xdg-open', 'okular', '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', 'okular', 'dviout -Set=!m'], ++ checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'dviout -Set=!m'], + 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'], diff --git a/lyx.spec b/lyx.spec index 62dd756..b76bf6f 100644 --- a/lyx.spec +++ b/lyx.spec @@ -3,23 +3,28 @@ %define _with_aiksaurus --with-aiksaurus %endif +%if 0%{?fedora} > 9 +%define build_noarch BuildArch: noarch +%endif + ## lyx-fonts %global fontname lyx %global common_desc \ A collection of Math symbol fonts. -%if 0%{?fedora} > 8 +#if 0%{?fedora} > 8 +%if 0 %define fontpackages 1 BuildRequires: fontpackages-devel %else -## FIXME!! +%define _fontdir %{_datadir}/fonts/%{fontname} %endif %define _without_included_boost --without-included-boost Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx -Version: 1.6.3 -Release: 3%{?dist} +Version: 1.6.4 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Publishing @@ -28,7 +33,7 @@ Url: http://www.lyx.org/ Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}%{?pre}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: lyx-1.6.3-xdg_open.patch +Patch1: lyx-1.6.4-xdg_open.patch Source1: lyxrc.dist @@ -111,9 +116,7 @@ and let the computer take care of the rest. %package common Summary: Common files of %{name} Requires: %{name} = %{version}-%{release} -%if 0%{?fedora} > 9 -BuildArch: noarch -%endif +%{?build_noarch} %description common {summary}. @@ -132,9 +135,7 @@ Requires: %{fontname}-eufm10-fonts = %{version}-%{release} Requires: %{fontname}-msam10-fonts = %{version}-%{release} Requires: %{fontname}-msbm10-fonts = %{version}-%{release} Requires: %{fontname}-wasy10-fonts = %{version}-%{release} -%if 0%{?fedora} > 9 -BuildArch: noarch -%endif +%{?build_noarch} %description -n %{fontname}-fonts-compat This package only exists to help transition mathml-fonts users to the new package split. It will be removed after one distribution release cycle, please @@ -147,9 +148,7 @@ Summary: Common files of %{fontname}-fonts # One of the font files (wasy10) is separately licensed GPL+. License: Copyright only and GPL+ %{?fontpackages:Requires: fontpackages-filesystem} -%if 0%{?fedora} > 9 -BuildArch: noarch -%endif +%{?build_noarch} %description -n %{name}-fonts-common This package consists of files used by other %{fontname}-fonts packages. @@ -157,101 +156,73 @@ This package consists of files used by other %{fontname}-fonts packages. Summary: Cmex10 fonts License: Copyright only Requires: %{fontname}-fonts-common = %{version}-%{release} -%if 0%{?fedora} > 9 -BuildArch: noarch -%endif +%{?build_noarch} %description -n %{fontname}-cmex10-fonts %common_desc -%{?_font_pkg:%_font_pkg -n cmex10 cmex10.ttf} %package -n %{fontname}-cmmi10-fonts Summary: Cmmi10 fonts License: Copyright only Requires: %{fontname}-fonts-common = %{version}-%{release} -%if 0%{?fedora} > 9 -BuildArch: noarch -%endif +%{?build_noarch} %description -n %{fontname}-cmmi10-fonts %common_desc -%{?_font_pkg:%_font_pkg -n cmmi10 cmmi10.ttf} %package -n %{fontname}-cmr10-fonts Summary: Cmr10 fonts License: Copyright only Requires: %{fontname}-fonts-common = %{version}-%{release} -%if 0%{?fedora} > 9 -BuildArch: noarch -%endif +%{?build_noarch} %description -n %{fontname}-cmr10-fonts %common_desc -%{?_font_pkg:%_font_pkg -n cmr10 cmr10.ttf} %package -n %{fontname}-cmsy10-fonts Summary: Cmsy10 fonts License: Copyright only Requires: %{fontname}-fonts-common = %{version}-%{release} -%if 0%{?fedora} > 9 -BuildArch: noarch -%endif +%{?build_noarch} %description -n %{fontname}-cmsy10-fonts %common_desc -%{?_font_pkg:%_font_pkg -n cmsy10 cmsy10.ttf} %package -n %{fontname}-esint10-fonts Summary: Esint10 fonts License: Copyright only Requires: %{fontname}-fonts-common = %{version}-%{release} -%if 0%{?fedora} > 9 -BuildArch: noarch -%endif +%{?build_noarch} %description -n %{fontname}-esint10-fonts %common_desc -%{?_font_pkg:%_font_pkg -n esint10 esint10.ttf} %package -n %{fontname}-eufm10-fonts Summary: Eufm10 fonts License: Copyright only Requires: %{fontname}-fonts-common = %{version}-%{release} -%if 0%{?fedora} > 9 -BuildArch: noarch -%endif +%{?build_noarch} %description -n %{fontname}-eufm10-fonts %common_desc -%{?_font_pkg:%_font_pkg -n eufm10 eufm10.ttf} %package -n %{fontname}-msam10-fonts Summary: Msam10 fonts License: Copyright only Requires: %{fontname}-fonts-common = %{version}-%{release} -%if 0%{?fedora} > 9 -BuildArch: noarch -%endif +%{?build_noarch} %description -n %{fontname}-msam10-fonts %common_desc -%{?_font_pkg:%_font_pkg -n msam10 msam10.ttf} %package -n %{fontname}-msbm10-fonts Summary: Msbm10 fonts License: Copyright only Requires: %{fontname}-fonts-common = %{version}-%{release} -%if 0%{?fedora} > 9 -BuildArch: noarch -%endif +%{?build_noarch} %description -n %{fontname}-msbm10-fonts %common_desc -%{?_font_pkg:%_font_pkg -n msbm10 msbm10.ttf} %package -n %{fontname}-wasy10-fonts Summary: Wasy10 fonts License: GPL+ Requires: %{fontname}-fonts-common = %{version}-%{release} -%if 0%{?fedora} > 9 -BuildArch: noarch -%endif +%{?build_noarch} %description -n %{fontname}-wasy10-fonts %common_desc -%{?_font_pkg:%_font_pkg -n wasy10 wasy10.ttf} - %prep @@ -373,9 +344,91 @@ rm -rf %{buildroot} %defattr(0644,root,root,0755) %doc lib/fonts/BaKoMaFontLicense.txt %doc lib/fonts/ReadmeBaKoMa4LyX.txt +%dir %{_fontdir} + +%if 0%{?fontpackages:1} +%_font_pkg -n cmex10 cmex10.ttf +%_font_pkg -n cmmi10 cmmi10.ttf +%_font_pkg -n cmr10 cmr10.ttf +%_font_pkg -n cmsy10 cmsy10.ttf +%_font_pkg -n esint10 esint10.ttf +%_font_pkg -n eufm10 eufm10.ttf +%_font_pkg -n msam10 msam10.ttf +%_font_pkg -n msbm10 msbm10.ttf +%_font_pkg -n wasy10 wasy10.ttf +%else + +%files -n %{fontname}-cmex10-fonts +%defattr(-,root,root,-) +%{_fontdir}/cmex10.ttf + +%posttrans -n %{fontname}-cmex10-fonts +fc-cache %{_fontdir} 2> /dev/null ||: + +%files -n %{fontname}-cmmi10-fonts +%defattr(-,root,root,-) +%{_fontdir}/cmmi10.ttf + +%posttrans -n %{fontname}-cmmi10-fonts +fc-cache %{_fontdir} 2> /dev/null ||: + +%files -n %{fontname}-cmr10-fonts +%defattr(-,root,root,-) +%{_fontdir}/cmr10.ttf + +%posttrans -n %{fontname}-cmr10-fonts +fc-cache %{_fontdir} 2> /dev/null ||: + +%files -n %{fontname}-cmsy10-fonts +%defattr(-,root,root,-) +%{_fontdir}/cmsy10.ttf + +%posttrans -n %{fontname}-cmsy10-fonts +fc-cache %{_fontdir} 2> /dev/null ||: + +%files -n %{fontname}-esint10-fonts +%defattr(-,root,root,-) +%{_fontdir}/esint10.ttf + +%posttrans -n %{fontname}-esint10-fonts +fc-cache %{_fontdir} 2> /dev/null ||: + +%files -n %{fontname}-eufm10-fonts +%defattr(-,root,root,-) +%{_fontdir}/eufm10.ttf + +%posttrans -n %{fontname}-eufm10-fonts +fc-cache %{_fontdir} 2> /dev/null ||: + +%files -n %{fontname}-msam10-fonts +%defattr(-,root,root,-) +%{_fontdir}/msam10.ttf + +%posttrans -n %{fontname}-msam10-fonts +fc-cache %{_fontdir} 2> /dev/null ||: + +%files -n %{fontname}-msbm10-fonts +%defattr(-,root,root,-) +%{_fontdir}/msbm10.ttf + +%posttrans -n %{fontname}-msbm10-fonts +fc-cache %{_fontdir} 2> /dev/null ||: + +%files -n %{fontname}-wasy10-fonts +%defattr(-,root,root,-) +%{_fontdir}/wasy10.ttf + +%posttrans -n %{fontname}-wasy10-fonts +fc-cache %{_fontdir} 2> /dev/null ||: + +%endif %changelog +* Sat Aug 22 2009 Rex Dieter - 1.6.4-1 +- lyx-1.6.4 +- handle fonts manually (now EPEL-5 compatible) + * Mon Aug 03 2009 Rex Dieter - 1.6.3-3 - add lyx-*-fonts subpkgs (#452357, #514549) - -common (noarch) subpkg diff --git a/sources b/sources index e559b51..65d13e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c524e72f7e4d64224c6bfdbd84065dd8 lyx-1.6.3.tar.bz2 +3dd759f91acd7765c304336c51aa3a2a lyx-1.6.4.tar.bz2