rpms/lyx/F-7 lyx-1.5.0rc2-xdg-open.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 lyx.spec, 1.55, 1.56 sources, 1.18, 1.19 lyx-1.5.0beta2-xdg_open.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Jul 2 10:34:42 UTC 2007
- Previous message: rpms/c2050/devel c2050-0.3a-signedness.patch, NONE, 1.1 c2050.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/koffice/FC-6 koffice-1.6.3-nodisplay.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 koffice.spec, 1.48, 1.49 sources, 1.15, 1.16 koffice-1.6.2-kdchart_export.patch, 1.1, NONE koffice-1.6.2-kexi_export.patch, 1.1, NONE
- 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-serv9755
Modified Files:
.cvsignore lyx.spec sources
Added Files:
lyx-1.5.0rc2-xdg-open.patch
Removed Files:
lyx-1.5.0beta2-xdg_open.patch
Log Message:
* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.9.rc2
- scriptlet optmization
* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.8.rc2
- lyx-1.5.0rc2
lyx-1.5.0rc2-xdg-open.patch:
--- NEW FILE lyx-1.5.0rc2-xdg-open.patch ---
--- lyx-1.5.0rc2/lib/configure.py.xdg_open 2007-06-19 16:20:09.000000000 -0500
+++ lyx-1.5.0rc2/lib/configure.py 2007-06-28 09:03:15.000000000 -0500
@@ -238,7 +238,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" ""
@@ -252,7 +252,7 @@ def checkFormatEntries(dtl_tools):
\Format xpm xpm XPM "" "%s" "%s" ""''' % \
(iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie) )
#
- checkViewer('a text editor', ['xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \
+ checkViewer('a text editor', ['xdg-open', 'xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \
'nedit', 'gedit', 'notepad'],
rc_entry = [r'''\Format asciichess asc "Plain text (chess output)" "" "" "%%" ""
\Format asciiimage asc "Plain text (image)" "" "" "%%" ""
@@ -273,23 +273,23 @@ 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 "" "" "document,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'],
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-7/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 7 Jun 2007 19:32:50 -0000 1.20
+++ .cvsignore 2 Jul 2007 10:34:06 -0000 1.21
@@ -1,3 +1,4 @@
clog
beamer.layout
lyx-1.5.0rc1.tar.bz2
+lyx-1.5.0rc2.tar.bz2
Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-7/lyx.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- lyx.spec 7 Jun 2007 19:32:50 -0000 1.55
+++ lyx.spec 2 Jul 2007 10:34:06 -0000 1.56
@@ -1,10 +1,10 @@
-%define pre rc1
+%define pre rc2
Summary: WYSIWYM (What You See Is What You Mean) document processor
Name: lyx
Version: 1.5.0
-Release: 0.7.%{pre}%{?dist}
+Release: 0.9.%{pre}%{?dist}
License: GPL
Group: Applications/Publishing
@@ -12,7 +12,7 @@
Source0: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?pre}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: lyx-1.5.0beta2-xdg_open.patch
+Patch1: lyx-1.5.0rc2-xdg-open.patch
Source1: lyxrc.dist
@@ -41,9 +41,8 @@
Requires: tetex-dvips
Requires: mathml-fonts
Requires: ghostscript
-# Short-hand for Requires,Requires(post,postun)
-Prereq: xdg-utils
## Soft dependencies
+Requires(hint): xdg-utils
%if 0%{?fedora} > 3
# Document->Change Tracking feature
Requires(hint): tetex-dvipost
@@ -76,7 +75,7 @@
%setup -q -n %{name}-%{version}%{?pre}
-%patch1 -p1 -b .xdg_open
+%patch1 -p1 -b .xdg-open
%build
@@ -124,16 +123,22 @@
%find_lang %{name}
-%post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+# experimental scriptlet optimization
+# %postun still required until either %posttrans runs on uninstall
+# or postuntrans exists. -- Rex
+%posttrans
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
texhash > /dev/null 2>&1 ||:
-cd %{_datadir}/lyx && ./configure.py > /dev/null 2>&1 ||:
%postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ]; then
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
texhash > /dev/null 2>&1 ||:
+fi
## Catch installed/uninstalled helpers
## not sure if this is really needed anymore, as it seems to be a per-user thing,
@@ -169,6 +174,12 @@
%changelog
+* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.9.rc2
+- scriptlet optmization
+
+* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.8.rc2
+- lyx-1.5.0rc2
+
* Fri Jun 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.7.rc1
- lyx-1.5.0rc1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-7/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 7 Jun 2007 19:32:50 -0000 1.18
+++ sources 2 Jul 2007 10:34:06 -0000 1.19
@@ -1 +1 @@
-f74bac4374060afa2fec296d16f1e449 lyx-1.5.0rc1.tar.bz2
+000e5962d697910fcf16814fedaaf575 lyx-1.5.0rc2.tar.bz2
--- lyx-1.5.0beta2-xdg_open.patch DELETED ---
- Previous message: rpms/c2050/devel c2050-0.3a-signedness.patch, NONE, 1.1 c2050.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/koffice/FC-6 koffice-1.6.3-nodisplay.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 koffice.spec, 1.48, 1.49 sources, 1.15, 1.16 koffice-1.6.2-kdchart_export.patch, 1.1, NONE koffice-1.6.2-kexi_export.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list