rpms/lyx/F-9 lyx-1.6.0-xdg_open.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 lyx.spec, 1.71, 1.72 sources, 1.27, 1.28 lyx-1.5.4-xdg_open.patch, 1.1, NONE

Rex Dieter rdieter at fedoraproject.org
Tue Nov 11 20:43:17 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/lyx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13503

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.6.0-xdg_open.patch 
Removed Files:
	lyx-1.5.4-xdg_open.patch 
Log Message:
* Fri Nov 07 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-1
- lyx-1.6.0(final)


lyx-1.6.0-xdg_open.patch:

--- NEW FILE lyx-1.6.0-xdg_open.patch ---
diff -up lyx-1.6.0rc4/lib/configure.py.xdg_open lyx-1.6.0rc4/lib/configure.py
--- lyx-1.6.0rc4/lib/configure.py.xdg_open	2008-10-23 10:30:17.000000000 -0500
+++ lyx-1.6.0rc4/lib/configure.py	2008-10-24 19:20:53.000000000 -0500
@@ -260,7 +260,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"	""
@@ -303,29 +303,29 @@ 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               ""	""	""	"vector"')
     #
-    checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+    checkViewer('an HTML previewer', ['xdg-open', 'htmlview', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
         rc_entry = [r'\Format html       html    HTML                   H  "%%"	""	"document"'])
     #
     checkViewer('Noteedit', ['noteedit'],
         rc_entry = [r'\Format noteedit   not     Noteedit               "" "%%"	"%%"	"vector"'])
     #
-    checkViewer('an OpenDocument viewer', ['swriter', 'oowriter'],
+    checkViewer('an OpenDocument viewer', ['xdg-open', 'swriter', 'oowriter'],
         rc_entry = [r'\Format odt        odt     OpenDocument           "" "%%"	"%%"	"document,vector"'])
     #
     # entried that do not need checkProg


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-9/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	30 Jul 2008 15:54:50 -0000	1.29
+++ .cvsignore	11 Nov 2008 20:42:46 -0000	1.30
@@ -1 +1 @@
-lyx-1.5.6.tar.bz2
+lyx-1.6.0.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-9/lyx.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- lyx.spec	4 Aug 2008 00:33:23 -0000	1.71
+++ lyx.spec	11 Nov 2008 20:42:47 -0000	1.72
@@ -1,16 +1,17 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.5.6
-Release: 2%{?dist}
+Version: 1.6.0
+Release: 1%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
-Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
+#Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
+Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: lyx-1.5.4-xdg_open.patch
+Patch1: lyx-1.6.0-xdg_open.patch
 
 Source1: lyxrc.dist
 
@@ -26,11 +27,14 @@
 BuildRequires: zlib-devel
 
 # optional minimal qt4 dep
-%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
+%{?_qt_version:Requires: qt4 >= %{_qt4_version}}
 
-Obsoletes: %{name}-qt < %{version}-%{release}
+Obsoletes: %{name}-qt < 1.5.0 
 Provides:  %{name}-qt = %{version}-%{release}
-Obsoletes: %{name}-xforms < %{version}
+Obsoletes: %{name}-xforms < 1.5.0 
+
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 
 %if 0%{?fedora} > 8
 BuildRequires: tex(dvips) tex(latex) texlive-fonts
@@ -88,11 +92,11 @@
 
 %configure \
   --disable-rpath \
+  --enable-build-type=release \
   --enable-optimization="%{optflags}" \
   --with-aiksaurus \
   --with-aspell \
-  --without-warnings --disable-dependency-tracking \
-  --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks
+  --disable-dependency-tracking
 
 make %{?_smp_mflags}
 
@@ -118,8 +122,8 @@
   %{SOURCE10}
 
 # icon
-install -p -D -m644 lib/images/lyx.xpm \
-  %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/lyx.xpm
+install -p -D -m644 lib/images/lyx.png \
+  %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/lyx.png
 
 # ghost'd files
 touch %{buildroot}%{_datadir}/lyx/lyxrc.defaults
@@ -133,17 +137,15 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-%{_bindir}/texhash > /dev/null 2>&1 ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
+texhash > /dev/null 2>&1 ||:
 
 %postun
 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 ||:
-%{_bindir}/texhash > /dev/null 2>&1 ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
+texhash > /dev/null 2>&1 ||:
 fi
 
 ## Catch installed/uninstalled helpers
@@ -166,7 +168,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc ANNOUNCE ChangeLog lib/CREDITS NEWS README
+%doc ANNOUNCE lib/CREDITS NEWS README
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*.desktop
@@ -180,16 +182,48 @@
 
 
 %changelog
-* Sun Aug 03 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5.6-2
+* Fri Nov 07 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-1
+- lyx-1.6.0(final)
+
+* Tue Oct 28 2008 José Matos <jamatos at fc.up.pt> - 1.6.0-0.11.rc5
+- lyx-1.6.0rc5
+
+* Fri Oct 24 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.10.rc4
+- lyx-1.6.0rc4
+
+* Tue Sep 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.9.rc3
+- lyx-1.6.0rc3
+
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.8.rc3
+- lyx-1.6.0rc3-svn26576
+
+* Fri Sep 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.7.rc2
+- lyx-1.6.0rc2
+
+* Wed Aug 06 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.6.rc1
+- lyx-1.6.0rc1
+
+* Sun Aug 03 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-0.5.beta4
 - Requires: dvipdfm (f9+, #448647)
-- add minimal qt4 dep
+- add (optional) minimal qt4 dep
 - make Req: tex-simplecv fedora only
 - drop file deps (texhash)
 
-* Wed Jul 30 2008 José Matos <jamatos[AT]fc.up.pt> - 1.5.6-1
-- lyx-1.5.6
+* Wed Jul 16 2008 José Matos <jamatos[AT]fc.up.pt> - 1.6.0-0.4.beta4
+- Changelog has been removed from the distribution
+
+* Wed Jul 16 2008 José Matos <jamatos[AT]fc.up.pt> - 1.6.0-0.3.beta4
+- icon has changed from xpm to png
+
+* Wed Jul 16 2008 José Matos <jamatos[AT]fc.up.pt> - 1.6.0-0.2.beta4
+- revert to use pre instead of devrel.
 - require tex-simplecv (#428526)
 
+* Wed Jul 16 2008 José Matos <jamatos[AT]fc.up.pt> - 1.6.0-0.1.beta4
+- lyx-1.6.0beta4
+- --enable-build-type=release disables extra debug information (no
+    warnings, debug, assertions, concept-checks and stdlib-debug).
+
 * Mon May 12 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5.5-1
 - lyx-1.5.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/F-9/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	30 Jul 2008 15:54:50 -0000	1.27
+++ sources	11 Nov 2008 20:42:47 -0000	1.28
@@ -1 +1 @@
-69f2eecba80b143554911c8b3d814a0e  lyx-1.5.6.tar.bz2
+a51469e84e3c377df94a1546cf3077b6  lyx-1.6.0.tar.bz2


--- lyx-1.5.4-xdg_open.patch DELETED ---




More information about the fedora-extras-commits mailing list