rpms/lyx/F-7 lyx-1.5.4-xdg_open.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 lyx.spec, 1.61, 1.62 sources, 1.23, 1.24
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Feb 26 20:17:10 UTC 2008
- Previous message (by thread): rpms/lyx/F-8 lyx-1.5.4-xdg_open.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 lyx.spec, 1.65, 1.66 sources, 1.24, 1.25
- Next message (by thread): rpms/kernel/devel linux-2.6-e1000-ich9.patch, 1.2, 1.3 kernel.spec, 1.451, 1.452
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/lyx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32046
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/F-7/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 18 Dec 2007 13:00:12 -0000 1.25
+++ .cvsignore 26 Feb 2008 20:16:24 -0000 1.26
@@ -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/F-7/lyx.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- lyx.spec 18 Dec 2007 13:00:12 -0000 1.61
+++ lyx.spec 26 Feb 2008 20:16:24 -0000 1.62
@@ -1,14 +1,16 @@
Summary: WYSIWYM (What You See Is What You Mean) document processor
Name: lyx
-Version: 1.5.3
+Version: 1.5.4
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Publishing
Url: http://www.lyx.org/
Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch1: lyx-1.5.4-xdg_open.patch
Source1: lyxrc.dist
@@ -21,26 +23,22 @@
BuildRequires: gettext
BuildRequires: python
BuildRequires: qt4-devel
-BuildRequires: tetex-latex
-BuildRequires: tetex-fonts
BuildRequires: zlib-devel
Obsoletes: %{name}-qt < %{version}-%{release}
Provides: %{name}-qt = %{version}-%{release}
Obsoletes: %{name}-xforms < %{version}
-Requires(post): %{_bindir}/texhash
-Requires(postun): %{_bindir}/texhash
+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
@@ -86,39 +86,42 @@
--with-aiksaurus \
--with-aspell \
--without-warnings --disable-dependency-tracking \
- --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks
+ --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks
make %{?_smp_mflags}
%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}
@@ -138,11 +141,11 @@
fi
## Catch installed/uninstalled helpers
-## not sure if this is really needed anymore, as it seems to be a per-user thing,
+## not sure if this is really needed anymore, as it seems to be a per-user thing,
## and besides, we use xdg-open now -- Rex
%triggerin -- latex2html,wv
if [ $2 -gt 1 ]; then
-cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||:
+cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||:
fi
%triggerun -- latex2html,wv
@@ -152,7 +155,7 @@
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files -f %{name}.lang
@@ -171,6 +174,14 @@
%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
+
* Mon Dec 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.3-1
- lyx-1.5.3
@@ -212,7 +223,7 @@
- fix qt-4.3 crasher
* Tue Mar 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.3.beta1
-- stop omitting -fexceptions
+- stop omitting -fexceptions
* Wed Mar 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.2.beta1
- +Requires: tetex-IEEEtran (#232840)
@@ -369,13 +380,13 @@
- rebuilt
* Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-3
-- BR: htmlview
+- BR: htmlview
- Requires: htmlview, gsview (so build-time-detected helper apps are
available at runtime)
* Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.3
- BR: htmlview
-- Requires: htmlview, gsview (so build-time-detected helper apps are
+- Requires: htmlview, gsview (so build-time-detected helper apps are
available at runtime)
* Wed Oct 20 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.2
@@ -417,7 +428,7 @@
- Categories=Office
* Mon Nov 24 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.3
-- Requires: tetex-latex
+- Requires: tetex-latex
- support MimeType(s): application/x-lyx;text/x-lyx
* Sat Nov 22 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-7/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 18 Dec 2007 13:00:12 -0000 1.23
+++ sources 26 Feb 2008 20:16:24 -0000 1.24
@@ -1 +1 @@
-4fe013248713bb126877c317cad57238 lyx-1.5.3.tar.bz2
+6f424dc23af78e1d39c6962101cde2e9 lyx-1.5.4.tar.bz2
- Previous message (by thread): rpms/lyx/F-8 lyx-1.5.4-xdg_open.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 lyx.spec, 1.65, 1.66 sources, 1.24, 1.25
- Next message (by thread): rpms/kernel/devel linux-2.6-e1000-ich9.patch, 1.2, 1.3 kernel.spec, 1.451, 1.452
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list