[lyx] Update xdg_open patch for version 2.0.1
José Abílio Oliveira Matos
jamatos at fedoraproject.org
Mon Sep 5 18:26:25 UTC 2011
commit d6db22eabd568cba5ec5562a00718ef3e2825d15
Author: José Matos <jamatos at fedoraproject.org>
Date: Mon Sep 5 19:26:07 2011 +0100
Update xdg_open patch for version 2.0.1
.gitignore | 3 +--
...0rc1-xdg_open.patch => lyx-2.0.1-xdg_open.patch | 19 +++++++++----------
lyx.spec | 7 +++++--
3 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ba2ecb9..0288b97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
clog
-/lyx-2.0.0rc3.tar.xz
-/lyx-2.0.0.tar.xz
+/lyx-2.0.1.tar.xz
diff --git a/lyx-2.0.0rc1-xdg_open.patch b/lyx-2.0.1-xdg_open.patch
similarity index 90%
rename from lyx-2.0.0rc1-xdg_open.patch
rename to lyx-2.0.1-xdg_open.patch
index 01a493a..ec3400d 100644
--- a/lyx-2.0.0rc1-xdg_open.patch
+++ b/lyx-2.0.1-xdg_open.patch
@@ -1,7 +1,6 @@
-diff -ur lyx-2.0.0rc1.orig/lib/configure.py lyx-2.0.0rc1/lib/configure.py
---- lyx-2.0.0rc1.orig/lib/configure.py 2011-03-01 22:45:24.000000000 +0000
-+++ lyx-2.0.0rc1/lib/configure.py 2011-03-11 18:53:32.189708571 +0000
-@@ -458,7 +458,7 @@
+--- lyx-2.0.1.orig/lib/configure.py 2011-08-29 23:23:17.000000000 +0100
++++ lyx-2.0.1/lib/configure.py 2011-09-05 19:14:37.461269747 +0100
+@@ -510,7 +510,7 @@
checkViewerEditor('a SVG viewer and editor', ['inkscape'],
rc_entry = [r'\Format svg svg SVG "" "%%" "%%" "vector"'])
#
@@ -10,30 +9,30 @@ diff -ur lyx-2.0.0rc1.orig/lib/configure.py lyx-2.0.0rc1/lib/configure.py
rc_entry = [r'''\Format bmp bmp BMP "" "%s" "%s" ""
\Format gif gif GIF "" "%s" "%s" ""
\Format jpg jpg JPEG "" "%s" "%s" ""
-@@ -521,7 +521,7 @@
- \Format excel xls "Excel spreadsheet" "" "" "%%" "document"
- \Format oocalc ods "OpenOffice spreadsheet" "" "" "%%" "document"'''])
+@@ -573,7 +573,7 @@
+ \Format excel xls "Excel spreadsheet" "" "" "%%" "document"
+ \Format oocalc ods "OpenOffice spreadsheet" "" "" "%%" "document"'''])
#
- path, xhtmlview = checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+ path, xhtmlview = checkViewer('an HTML previewer', ['xdg-open', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
rc_entry = [r'\Format xhtml xhtml "LyXHTML" y "%%" "" "document,menu=export"'])
if xhtmlview == "":
addToRC(r'\Format xhtml xhtml "LyXHTML" y "" "" "document,menu=export"')
-@@ -535,11 +535,11 @@
+@@ -587,11 +587,11 @@
#
#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"'''])
+ \Format ps ps Postscript t "%%" "" "document,vector,menu=export"'''])
# for xdg-open issues look here: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg151818.html
- 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,menu=export"
\Format pdf2 pdf "PDF (pdflatex)" F "%%" "" "document,vector,menu=export"
-@@ -547,14 +547,14 @@
+@@ -599,14 +599,14 @@
\Format pdf4 pdf "PDF (XeTeX)" X "%%" "" "document,vector,menu=export"
\Format pdf5 pdf "PDF (LuaTeX)" u "%%" "" "document,vector,menu=export"'''])
#
diff --git a/lyx.spec b/lyx.spec
index b27c6a8..2520e5c 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -13,7 +13,7 @@ BuildRequires: fontpackages-devel
Summary: WYSIWYM (What You See Is What You Mean) document processor
Name: lyx
Version: 2.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Publishing
@@ -26,7 +26,7 @@ Source10: lyx.desktop
## upstreamable patches
# submitted, but upstream rejected it. we currently agree to disagree.
-Patch50: lyx-2.0.0rc1-xdg_open.patch
+Patch50: lyx-2.0.1-xdg_open.patch
# Do we need to rebuild configuration files?
%global autotools 0
@@ -274,6 +274,9 @@ fc-cache %{_fontdir} 2> /dev/null ||:
%changelog
+* Mon Sep 5 2011 José Matos <jamatos at fedoraproject.org> - 2.0.1-2
+- Update xdg_open patch for version 2.0.1
+
* Mon Sep 5 2011 José Matos <jamatos at fedoraproject.org> - 2.0.1-1
- Update to 2.0.1
More information about the scm-commits
mailing list