rpms/lyx/FC-5 lyx-1.4.4-xdg_open.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 lyx-qt.desktop, 1.2, 1.3 lyx-xforms.desktop, 1.2, 1.3 lyx.desktop, 1.4, 1.5 lyx.spec, 1.44, 1.45 sources, 1.14, 1.15 lyx-1.4.3-helpers.patch, 1.2, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Fri Feb 16 13:37:03 UTC 2007


Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11069

Modified Files:
	.cvsignore lyx-qt.desktop lyx-xforms.desktop lyx.desktop 
	lyx.spec sources 
Added Files:
	lyx-1.4.4-xdg_open.patch 
Removed Files:
	lyx-1.4.3-helpers.patch 
Log Message:
lyx-1.4.4


lyx-1.4.4-xdg_open.patch:

--- NEW FILE lyx-1.4.4-xdg_open.patch ---
--- lyx-1.4.4/lib/configure.py.helpers	2007-02-13 17:20:29.000000000 -0600
+++ lyx-1.4.4/lib/configure.py	2007-02-14 09:53:28.000000000 -0600
@@ -251,7 +251,7 @@
     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'])
+    path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp'])
     path, ie = checkViewer('a raster image editor', ['gimp'])
     addToRC(r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"
 \Format gif        gif     GIF                    "" "%s"	"%s"
@@ -283,23 +283,23 @@
     #
     #checkProg('a Postscript interpreter', ['gs'],
     #  rc_entry = [ r'\ps_command "%%"' ])
-    checkViewer('a Postscript previewer', ['gv', 'ghostview -swap', 'kghostview'],
+    checkViewer('a Postscript previewer', ['xdg-open', 'gv', 'ghostview -swap', 'kghostview'],
         rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"vector"
 \Format ps         ps      Postscript             t  "%%"	""	"vector"'''])
     #
-    checkViewer('a PDF previewer', ['acrobat', 'acroread', 'gv', 'ghostview', \
+    checkViewer('a PDF previewer', ['xdg-open', 'acrobat', 'acroread', 'gv', 'ghostview', \
                             'xpdf', 'kpdf', 'kghostview'],
         rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""	"vector"
 \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""	"vector"
 \Format pdf3       pdf    "PDF (dvipdfm)"         m  "%%"	""	"vector"'''])
     #
-    checkViewer('a DVI previewer', ['xdvi', 'kdvi'],
+    checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi'],
         rc_entry = [r'\Format dvi        dvi     DVI                    D  "%%"	""	"vector"'])
     if dtl_tools:
         # Windows only: DraftDVI
         addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	"vector"')
     #
-    checkViewer('a HTML previewer', ['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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	21 Sep 2006 15:43:12 -0000	1.14
+++ .cvsignore	16 Feb 2007 13:36:31 -0000	1.15
@@ -1,3 +1,4 @@
 clog
 beamer.layout
 lyx-1.4.3.tar.bz2
+lyx-1.4.4.tar.bz2


Index: lyx-qt.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx-qt.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lyx-qt.desktop	1 Oct 2006 23:15:30 -0000	1.2
+++ lyx-qt.desktop	16 Feb 2007 13:36:31 -0000	1.3
@@ -7,5 +7,5 @@
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Qt;Application;Office;WordProcessor;
+Categories=Qt;Office;WordProcessor;
 


Index: lyx-xforms.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx-xforms.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lyx-xforms.desktop	1 Oct 2006 23:15:30 -0000	1.2
+++ lyx-xforms.desktop	16 Feb 2007 13:36:31 -0000	1.3
@@ -7,5 +7,5 @@
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Application;Office;WordProcessor;
+Categories=Office;WordProcessor;
 


Index: lyx.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lyx.desktop	1 Oct 2006 23:15:30 -0000	1.4
+++ lyx.desktop	16 Feb 2007 13:36:31 -0000	1.5
@@ -7,5 +7,5 @@
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8
-Categories=Application;Office;WordProcessor;
+Categories=Office;WordProcessor;
 


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- lyx.spec	1 Oct 2006 23:56:13 -0000	1.44
+++ lyx.spec	16 Feb 2007 13:36:31 -0000	1.45
@@ -1,8 +1,8 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.4.3
-Release: 3%{?dist}
+Version: 1.4.4
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -10,7 +10,7 @@
 Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Patch1: lyx-1.4.3-helpers.patch
+Patch1: lyx-1.4.4-xdg_open.patch
 
 Source1: lyxrc.dist
 # app-wrapper for various frontends
@@ -45,10 +45,10 @@
 Requires: tetex-dvips
 Requires: mathml-fonts
 Requires: ghostscript
-Requires: htmlview
-Requires: xdg-utils
+# Short-hand for Requires+Requires(post,postun)
+Prereq: xdg-utils
 ## Soft dependencies
-%if "%{?fedora}" > "3"
+%if 0%{?fedora} > 3
 # dvipost adds support for lyx's Document->Change Tracking feature
 Requires(hint): tetex-dvipost
 Requires(hint): tetex-preview
@@ -89,19 +89,19 @@
 Provides: %{name}-frontend = %{version}-%{release}
 %description xforms
 %{summary}.
+Please note: This frontend is deprecated, and will no longer be included
+in lyx-1.5.x.
 
 
 %prep
 
 %setup -q -n %{name}-%{version}%{?beta}
 
-# FIXME
-%patch1 -p1 -b .helpers
+%patch1 -p1 -b .xdg_open
 
 
 %build
 
-# QT
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 # drop -fexceptions from optflags, suggested by lyx devs:
@@ -145,7 +145,7 @@
 # .desktop
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category="X-Fedora" --vendor="" \
+  --vendor="" \
   %{SOURCE21} %{SOURCE22}
 
 # generic/hicolor icon
@@ -165,25 +165,25 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 texhash > /dev/null 2>&1 ||:
 cd %{_datadir}/lyx && ./configure.py  > /dev/null 2>&1 ||:
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 texhash > /dev/null 2>&1 ||:
 
-# Catch installed/uninstalled helpers
-%triggerin -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv
+## 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
+%triggerin -- latex2html,wv
 if [ $2 -gt 1 ]; then
 cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||: 
 fi
 
-%triggerun -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv
+%triggerun -- latex2html,wv
 if [ $2 -eq 0 ]; then
 cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||:
 fi
@@ -220,12 +220,20 @@
 
 
 %changelog
+* Thu Feb 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.4-2
+- biffed sources, respin
+
+* Wed Feb 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.4-1
+- lyx-1.4.4
+- .desktop's: -Category=Application
+- mark -xforms as deprecated
+
 * Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.3-3
 - 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
+- lyx-1.4.3
 
 * Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.2-5
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	21 Sep 2006 15:43:12 -0000	1.14
+++ sources	16 Feb 2007 13:36:31 -0000	1.15
@@ -1,2 +1,2 @@
 c906271900a0627d3df2a38ad962a285  beamer.layout
-34a014a0034481381cbba517d4a00e61  lyx-1.4.3.tar.bz2
+2e778eba4191c5f9fb2cafa7901c322c  lyx-1.4.4.tar.bz2


--- lyx-1.4.3-helpers.patch DELETED ---




More information about the fedora-extras-commits mailing list