rpms/lyx/F-10 lyx-1.6.3-xdg_open.patch, NONE, 1.1 .cvsignore, 1.38, 1.39 lyx.spec, 1.86, 1.87 sources, 1.36, 1.37 lyx-1.6.0-xdg_open.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Thu Jun 4 18:04:54 UTC 2009
- Previous message (by thread): rpms/kdepim/devel .cvsignore, 1.61, 1.62 kdepim.spec, 1.220, 1.221 sources, 1.69, 1.70
- Next message (by thread): rpms/lyx/F-9 lyx-1.6.3-xdg_open.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 lyx.spec, 1.74, 1.75 sources, 1.30, 1.31 lyx-1.6.0-xdg_open.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/lyx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31225
Modified Files:
.cvsignore lyx.spec sources
Added Files:
lyx-1.6.3-xdg_open.patch
Removed Files:
lyx-1.6.0-xdg_open.patch
Log Message:
* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.3-1
- lyx-1.6.3
lyx-1.6.3-xdg_open.patch:
--- NEW FILE lyx-1.6.3-xdg_open.patch ---
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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-10/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore 16 Mar 2009 16:58:02 -0000 1.38
+++ .cvsignore 4 Jun 2009 18:04:23 -0000 1.39
@@ -1 +1 @@
-lyx-1.6.2.tar.bz2
+lyx-1.6.3.tar.bz2
Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-10/lyx.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- lyx.spec 16 Mar 2009 16:58:02 -0000 1.86
+++ lyx.spec 4 Jun 2009 18:04:23 -0000 1.87
@@ -3,7 +3,7 @@
Summary: WYSIWYM (What You See Is What You Mean) document processor
Name: lyx
-Version: 1.6.2
+Version: 1.6.3
Release: 1%{?dist}
License: GPLv2+
@@ -13,7 +13,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.0-xdg_open.patch
+Patch1: lyx-1.6.3-xdg_open.patch
Source1: lyxrc.dist
@@ -37,9 +37,6 @@ Obsoletes: %{name}-qt < 1.5.0
Provides: %{name}-qt = %{version}-%{release}
Obsoletes: %{name}-xforms < 1.5.0
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
%if 0%{?fedora} > 8
BuildRequires: tex(dvips) tex(latex) texlive-fonts
Requires(post): texlive
@@ -121,9 +118,8 @@ mv %{buildroot}%{_datadir}/lyx/tex \
%{buildroot}${texmf}/tex/latex/lyx
# .desktop
-desktop-file-install \
- --dir %{buildroot}%{_datadir}/applications \
- --vendor="" \
+desktop-file-install --vendor="" \
+ --dir="%{buildroot}%{_datadir}/applications" \
%{SOURCE10}
# icon
@@ -142,17 +138,21 @@ rm -rf %{buildroot}%{_datadir}/lyx/fonts
%post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-texhash > /dev/null 2>&1 ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
%postun
-if [ $1 -eq 0 ]; then
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-texhash > /dev/null 2>&1 ||:
+if [ $1 -eq 0 ] ; then
+ texhash >& /dev/null
+ update-desktop-database -q &> /dev/null
+ touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
fi
+%posttrans
+texhash >& /dev/null
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
## Catch installed/uninstalled helpers
## 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
@@ -187,6 +187,12 @@ rm -rf %{buildroot}
%changelog
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.3-1
+- lyx-1.6.3
+
+* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.2-2
+- scriptlet optimization
+
* Sun Mar 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.2-1
- lyx-1.6.2
- use --without-included-boost unconditionally
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-10/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources 16 Mar 2009 16:58:02 -0000 1.36
+++ sources 4 Jun 2009 18:04:23 -0000 1.37
@@ -1 +1 @@
-c78bf5db40e649b067f3b86e412eb294 lyx-1.6.2.tar.bz2
+c524e72f7e4d64224c6bfdbd84065dd8 lyx-1.6.3.tar.bz2
--- lyx-1.6.0-xdg_open.patch DELETED ---
- Previous message (by thread): rpms/kdepim/devel .cvsignore, 1.61, 1.62 kdepim.spec, 1.220, 1.221 sources, 1.69, 1.70
- Next message (by thread): rpms/lyx/F-9 lyx-1.6.3-xdg_open.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 lyx.spec, 1.74, 1.75 sources, 1.30, 1.31 lyx-1.6.0-xdg_open.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list