rpms/lyx/devel lyx-1.6.4-xdg_open.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 lyx.spec, 1.98, 1.99 sources, 1.37, 1.38 lyx-1.6.3-xdg_open.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Sat Aug 22 18:07:28 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7254
Modified Files:
.cvsignore lyx.spec sources
Added Files:
lyx-1.6.4-xdg_open.patch
Removed Files:
lyx-1.6.3-xdg_open.patch
Log Message:
* Sat Aug 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.4-1
- lyx-1.6.4
- handle fonts manually (now EPEL-5 compatible)
lyx-1.6.4-xdg_open.patch:
configure.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE lyx-1.6.4-xdg_open.patch ---
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'],
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore 4 Jun 2009 16:55:31 -0000 1.39
+++ .cvsignore 22 Aug 2009 18:07:28 -0000 1.40
@@ -1 +1 @@
-lyx-1.6.3.tar.bz2
+lyx-1.6.4.tar.bz2
Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- lyx.spec 3 Aug 2009 17:23:58 -0000 1.98
+++ lyx.spec 22 Aug 2009 18:07:28 -0000 1.99
@@ -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 re
%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 = %{v
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}-fon
# 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 o
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 <rdieter at fedoraproject.org> - 1.6.4-1
+- lyx-1.6.4
+- handle fonts manually (now EPEL-5 compatible)
+
* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.3-3
- add lyx-*-fonts subpkgs (#452357, #514549)
- -common (noarch) subpkg
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- sources 4 Jun 2009 16:55:31 -0000 1.37
+++ sources 22 Aug 2009 18:07:28 -0000 1.38
@@ -1 +1 @@
-c524e72f7e4d64224c6bfdbd84065dd8 lyx-1.6.3.tar.bz2
+3dd759f91acd7765c304336c51aa3a2a lyx-1.6.4.tar.bz2
--- lyx-1.6.3-xdg_open.patch DELETED ---
More information about the scm-commits
mailing list