rpms/lyx/devel lyx-1.4.3-helpers.patch, 1.1, 1.2 lyx-qt.desktop, 1.1, 1.2 lyx-xforms.desktop, 1.1, 1.2 lyx.desktop, 1.3, 1.4 lyx.spec, 1.46, 1.47

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Sun Oct 1 23:14:32 UTC 2006


Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28832

Modified Files:
	lyx-1.4.3-helpers.patch lyx-qt.desktop lyx-xforms.desktop 
	lyx.desktop lyx.spec 
Log Message:
* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
- sync .desktop files with upstream
- use xdg-open as default helper, +Requires: xdg-utils


lyx-1.4.3-helpers.patch:

Index: lyx-1.4.3-helpers.patch
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx-1.4.3-helpers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-1.4.3-helpers.patch	21 Sep 2006 15:26:46 -0000	1.1
+++ lyx-1.4.3-helpers.patch	1 Oct 2006 23:14:31 -0000	1.2
@@ -5,20 +5,20 @@
      #checkProg('a Postscript interpreter', ['gs'],
      #  rc_entry = [ r'\ps_command "%%"' ])
 -    checkViewer('a Postscript previewer', ['gv', 'ghostview -swap', 'kghostview'],
-+    checkViewer('a Postscript previewer', ['evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
++    checkViewer('a Postscript previewer', ['xdg-open', 'evince', 'gsview', 'kghostview', 'gv', 'ghostview -swap'],
          rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""
  \Format ps         ps      Postscript             t  "%%"	""'''])
      #
 -    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'gv', 'ghostview', \
 -                            'xpdf', 'kpdf', 'kghostview'],
-+    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'evince', \
++    checkViewer('a PDF previewer', ['xdg-open', 'acrobat', 'acroread', 'evince', \
 +                            'xpdf', 'kpdf', 'gsview', 'kghostview', 'gv', 'ghostview'],
          rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""
  \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""
  \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""'''])
      #
 -    checkViewer('a DVI previewer', ['xdvi', 'kdvi'],
-+    checkViewer('a DVI previewer', ['kdvi', 'xdvi'],
++    checkViewer('a DVI previewer', ['xdg-open', 'kdvi', 'xdvi'],
          rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""'])
      if ((os.name == 'nt' or sys.platform == 'cygwin') and
              checkProg('DVI to DTL converter', ['dv2dt']) != ['', ''] and
@@ -27,7 +27,7 @@
          addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""')
      #
 -    checkViewer('a HTML previewer', ['mozilla file://$$p$$i', 'netscape'],
-+    checkViewer('a HTML previewer', ['htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
++    checkViewer('a HTML previewer', ['xdg-open', 'htmlview file://$$p$$i', 'mozilla file://$$p$$i', 'netscape'],
          rc_entry = [r'\Format html       html    HTML                   H  "%%"	""'])
      #
      # entried that do not need checkProg


Index: lyx-qt.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx-qt.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-qt.desktop	20 Jan 2006 15:37:52 -0000	1.1
+++ lyx-qt.desktop	1 Oct 2006 23:14:31 -0000	1.2
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX-qt
-GenericName=WYSIWYM document processor
-Comment=Lyx using Qt frontend
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-qt
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Qt;Application;Office;WordProcessor;
 


Index: lyx-xforms.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx-xforms.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx-xforms.desktop	20 Jan 2006 15:37:52 -0000	1.1
+++ lyx-xforms.desktop	1 Oct 2006 23:14:31 -0000	1.2
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX-xforms
-GenericName=WYSIWYM document processor
-Comment=Lyx using XForms frontend
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-xforms
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Application;Office;WordProcessor;
 


Index: lyx.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lyx.desktop	20 Jan 2006 15:37:52 -0000	1.3
+++ lyx.desktop	1 Oct 2006 23:14:31 -0000	1.4
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Name=LyX
-GenericName=WYSIWYM document processor
-Comment=WYSIWYM document processor
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx
 Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;
+Categories=Application;Office;WordProcessor;
 


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- lyx.spec	21 Sep 2006 15:26:46 -0000	1.46
+++ lyx.spec	1 Oct 2006 23:14:31 -0000	1.47
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -46,6 +46,7 @@
 Requires: mathml-fonts
 Requires: ghostscript
 Requires: htmlview
+Requires: xdg-utils
 ## Soft dependencies
 %if "%{?fedora}" > "3"
 # dvipost adds support for lyx's Document->Change Tracking feature
@@ -144,7 +145,7 @@
 # .desktop
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category="X-Fedora" --vendor="fedora" \
+  --add-category="X-Fedora" --vendor="" \
   %{SOURCE21} %{SOURCE22}
 
 # generic/hicolor icon
@@ -219,6 +220,10 @@
 
 
 %changelog
+* Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-2
+- sync .desktop files with upstream
+- use xdg-open as default helper, +Requires: xdg-utils
+
 * Thu Sep 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-1
 - 1.4.3
 




More information about the fedora-extras-commits mailing list