[lyx] update to 2.0.6

jamatos jamatos at fedoraproject.org
Sat May 4 19:53:09 UTC 2013


commit acfe687334ddb1bb91f42d76f358f7e425829553
Author: José Matos <jamatos at fedoraproject.org>
Date:   Sat May 4 20:53:01 2013 +0100

    update to 2.0.6
    
    - update xdg-open patch

 ....0.1-xdg_open.patch => lyx-2.0.6-xdg_open.patch |   18 ++++++++++--------
 lyx.spec                                           |    3 ++-
 2 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/lyx-2.0.1-xdg_open.patch b/lyx-2.0.6-xdg_open.patch
similarity index 83%
rename from lyx-2.0.1-xdg_open.patch
rename to lyx-2.0.6-xdg_open.patch
index ec3400d..0d1f501 100644
--- a/lyx-2.0.1-xdg_open.patch
+++ b/lyx-2.0.6-xdg_open.patch
@@ -1,6 +1,8 @@
---- 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 @@
+diff --git a/lib/configure.py b/lib/configure.py
+index cad1502..e049377 100644
+--- a/lib/configure.py
++++ b/lib/configure.py
+@@ -547,7 +547,7 @@ def checkFormatEntries(dtl_tools):
      checkViewerEditor('a SVG viewer and editor', ['inkscape'],
          rc_entry = [r'\Format svg        svg     SVG                    "" "%%" "%%"	"vector"'])
      #
@@ -9,7 +11,7 @@
          rc_entry = [r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
  \Format gif        gif     GIF                    "" "%s"	"%s"	""
  \Format jpg        jpg     JPEG                   "" "%s"	"%s"	""
-@@ -573,7 +573,7 @@
+@@ -615,7 +615,7 @@ def checkFormatEntries(dtl_tools):
  \Format excel      xls    "Excel spreadsheet"      "" "" "%%"    "document"
  \Format oocalc     ods    "OpenOffice spreadsheet" "" "" "%%"    "document"'''])
   #
@@ -18,7 +20,7 @@
          rc_entry = [r'\Format xhtml      xhtml   "LyXHTML"              y "%%" ""    "document,menu=export"'])
      if xhtmlview == "":
          addToRC(r'\Format xhtml      xhtml   "LyXHTML"              y "" ""  "document,menu=export"')
-@@ -587,11 +587,11 @@
+@@ -630,11 +630,11 @@ def checkFormatEntries(dtl_tools):
      #
      #checkProg('a Postscript interpreter', ['gs'],
      #  rc_entry = [ r'\ps_command "%%"' ])
@@ -27,12 +29,12 @@
          rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"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', \
+-    checkViewer('a PDF previewer', ['pdfview', 'kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
++    checkViewer('a PDF previewer', ['xdg-open', 'pdfview', '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"
-@@ -599,14 +599,14 @@
+@@ -642,14 +642,14 @@ def checkFormatEntries(dtl_tools):
  \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 a338f14..5f99e83 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -26,7 +26,7 @@ Source10: lyx.desktop
 
 ## upstreamable patches
 # submitted, but upstream rejected it.  we currently agree to disagree.
-Patch50: lyx-2.0.1-xdg_open.patch
+Patch50: lyx-2.0.6-xdg_open.patch
 # Do we need to rebuild configuration files?
 %global autotools 0
 
@@ -291,6 +291,7 @@ fc-cache %{_fontdir} 2> /dev/null ||:
 %changelog
 * Sat May  4 2013 José Matos <jamatos at fedoraproject.org> - 2.0.6-1
 - update to 2.0.6
+- update xdg-open patch
 
 * Sun Feb 10 2013 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 2.0.5.1-3
 - Rebuild for Boost-1.53.0


More information about the scm-commits mailing list