rpms/lyx/EL-5 lyx-1.6.6-ImplicitDSOLinking_X11.patch, NONE, 1.1 lyx-1.6.6-xdg_open.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 lyx.spec, 1.58, 1.59 sources, 1.21, 1.22 lyx-1.6.5-ImplicitDSOLinking_X11.patch, 1.1, NONE lyx-1.6.5-ImplicitDSOLinking_pthread.patch, 1.1, NONE lyx-1.6.5-autoconf_2.65.patch, 1.1, NONE lyx-1.6.5-enchant.patch, 1.1, NONE lyx-1.6.5-xdg_open.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11508

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.6.6-ImplicitDSOLinking_X11.patch 
	lyx-1.6.6-xdg_open.patch 
Removed Files:
	lyx-1.6.5-ImplicitDSOLinking_X11.patch 
	lyx-1.6.5-ImplicitDSOLinking_pthread.patch 
	lyx-1.6.5-autoconf_2.65.patch lyx-1.6.5-enchant.patch 
	lyx-1.6.5-xdg_open.patch 
Log Message:
* Sun May 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.6.1-1
- lyx-1.6.6.1


lyx-1.6.6-ImplicitDSOLinking_X11.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE lyx-1.6.6-ImplicitDSOLinking_X11.patch ---
diff -up lyx-1.6.6/src/frontends/qt4/Makefile.am.ImplicitDSOLinking_X11 lyx-1.6.6/src/frontends/qt4/Makefile.am
--- lyx-1.6.6/src/frontends/qt4/Makefile.am.ImplicitDSOLinking_X11	2009-06-05 00:06:17.000000000 -0500
+++ lyx-1.6.6/src/frontends/qt4/Makefile.am	2010-05-21 07:34:22.182603709 -0500
@@ -35,7 +35,7 @@ noinst_LTLIBRARIES = liblyxqt4.la
 
 liblyxqt4_la_DEPENDENCIES = $(MOCEDFILES)
 liblyxqt4_la_LDFLAGS = $(QT4_LDFLAGS)
-liblyxqt4_la_LIBADD = $(QT4_LIB) 
+liblyxqt4_la_LIBADD = $(QT4_LIB) $(X_LIBS)
 
 AM_CPPFLAGS += \
 	$(QT4_CPPFLAGS) \
diff -up lyx-1.6.6/src/frontends/qt4/Makefile.in.ImplicitDSOLinking_X11 lyx-1.6.6/src/frontends/qt4/Makefile.in
--- lyx-1.6.6/src/frontends/qt4/Makefile.in.ImplicitDSOLinking_X11	2010-05-17 13:13:17.000000000 -0500
+++ lyx-1.6.6/src/frontends/qt4/Makefile.in	2010-05-21 07:35:55.500354702 -0500
@@ -428,7 +428,7 @@ MOCEDFILES = $(MOCHEADER:%.h=%_moc.cpp)
 noinst_LTLIBRARIES = liblyxqt4.la
 liblyxqt4_la_DEPENDENCIES = $(MOCEDFILES)
 liblyxqt4_la_LDFLAGS = $(QT4_LDFLAGS)
-liblyxqt4_la_LIBADD = $(QT4_LIB) 
+liblyxqt4_la_LIBADD = $(QT4_LIB) $(X_LIBS)
 SOURCEFILES = \
 	ButtonPolicy.cpp \
 	ButtonPolicy.h \

lyx-1.6.6-xdg_open.patch:
 configure.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE lyx-1.6.6-xdg_open.patch ---
diff -up lyx-1.6.6/lib/configure.py.xdg_open lyx-1.6.6/lib/configure.py
--- lyx-1.6.6/lib/configure.py.xdg_open	2009-12-09 06:12:20.000000000 -0600
+++ lyx-1.6.6/lib/configure.py	2010-05-21 07:32:10.050604913 -0500
@@ -279,7 +279,7 @@ def checkFormatEntries(dtl_tools):  
     checkViewer('an SVG viewer and editor', ['inkscape'],
         rc_entry = [r'\Format svg        svg     SVG                    "" "%%" "%%"	"vector"'])
     #
-    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"	""
@@ -322,23 +322,23 @@ def checkFormatEntries(dtl_tools):  
     #
     #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', 'okular', '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', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
+    checkViewer('a PDF previewer', ['xdg-open', 'okular', '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', 'okular', 'dviout -Set=!m'],
+    checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
         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'],


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	18 Mar 2010 13:29:47 -0000	1.21
+++ .cvsignore	10 Jun 2010 18:39:11 -0000	1.22
@@ -1,2 +1 @@
-lyx-1.6.5.tar.bz2
-lyx-1.6.5-autotools.patch.gz
+lyx-1.6.6.1.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/lyx.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- lyx.spec	18 Mar 2010 13:29:47 -0000	1.58
+++ lyx.spec	10 Jun 2010 18:39:12 -0000	1.59
@@ -3,7 +3,7 @@
 %define _with_aiksaurus --with-aiksaurus
 %endif
 
-%if 0%{?fedora} > 9
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
 %define build_noarch BuildArch: noarch
 %endif
 
@@ -21,43 +21,30 @@ BuildRequires: fontpackages-devel
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.6.5
-Release: 5%{?dist}
+Version: 1.6.6.1
+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.devel.lyx.org/pub/lyx/stable/lyx-%{version}%{?pre}.tar.bz2
+Source0: ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/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.6.5-xdg_open.patch
-# This patch should be upstream for lyx-1.6.6
-# (we only need this because of patch #50)
-Patch2: lyx-1.6.5-autoconf_2.65.patch
+Patch1: lyx-1.6.6-xdg_open.patch
 ## upstreamable patches
-# http://bugzilla.redhat.com/524046 , http://www.lyx.org/trc/ticket/6226
-Patch50: lyx-1.6.5-enchant.patch
 # fix implicit linking to -lX11, not quite upstreamable yet, configure isn't 
 # setting X_LIBS=-lX11 properly
-Patch51: lyx-1.6.5-ImplicitDSOLinking_X11.patch
-Patch52: lyx-1.6.5-ImplicitDSOLinking_pthread.patch
-
-# includes patch2,50,51 + pre-autogen'd.  avoids need to re-autogen'ing
-# on every package build.
-Patch54: lyx-1.6.5-autotools.patch.gz
+Patch51: lyx-1.6.6-ImplicitDSOLinking_X11.patch
 
 Source1: lyxrc.dist
 
 Source10: lyx.desktop
 
-%if 0%{?autotools}
-BuildRequires: automake libtool
-%endif
 %if 0%{?_with_aiksaurus:1}
 BuildRequires: aiksaurus-devel
 %endif
-BuildRequires: enchant-devel automake libtool
+BuildRequires: enchant-devel
 %if 0%{?_without_included_boost:1}
 BuildRequires: boost-devel
 %endif
@@ -164,27 +151,12 @@ A collection of Math symbol fonts for %{
 
 %patch1 -p1 -b .xdg_open
 
-%if 0%{?autotools}
-%patch2 -p1 -b .autoconf_2.65
-%patch50 -p1 -b .enchant
 # not fully upstreamable, configure isn't setting X_LIBS=-X11 for some reason
 %patch51 -p1 -b .ImplicitDSOLinking_X11
-# may or may not be needed on f13+ (I did while testing with -Wl,--no-add-needed on f12)
-#patch52 -p1 -b .ImplicitDSOLinking_pthread
-./autogen.sh
-%else
-# 
-%patch54 -p1 -b .autotools
-%endif
 
 
 %build
 
-# debugging fun
-#LDFLAGS="$LDFLAGS -Wl,--as-needed"
-#LDFLAGS="$LDFLAGS -Wl,--no-add-needed"
-#export LDFLAGS
-
 %configure \
   --disable-dependency-tracking \
   --disable-rpath \
@@ -195,6 +167,7 @@ A collection of Math symbol fonts for %{
   %{?_with_aiksaurus} \
   %{?_without_included_boost}
 
+# X_LIBS , see patch51
 make %{?_smp_mflags} X_LIBS=-lX11
 
 
@@ -306,6 +279,12 @@ fc-cache %{_fontdir} 2> /dev/null ||:
 
 
 %changelog
+* Sun May 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.6.1-1
+- lyx-1.6.6.1
+
+* Fri May 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.6-1
+- lyx-1.6.6
+
 * Sun Feb 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.5-5
 - FTBFS lyx-1.6.5-4.fc13: ImplicitDSOLinking (#565009)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	18 Mar 2010 14:10:59 -0000	1.21
+++ sources	10 Jun 2010 18:39:12 -0000	1.22
@@ -1,2 +1 @@
-35a10d8cb8e4bdd296092d9d981330c9  lyx-1.6.5.tar.bz2
-13da4daf9e0552adf1b53d2e149e9200  lyx-1.6.5-autotools.patch.gz
+a17e4c37f7def9f18052e03634d42ca5  lyx-1.6.6.1.tar.bz2


--- lyx-1.6.5-ImplicitDSOLinking_X11.patch DELETED ---


--- lyx-1.6.5-ImplicitDSOLinking_pthread.patch DELETED ---


--- lyx-1.6.5-autoconf_2.65.patch DELETED ---


--- lyx-1.6.5-enchant.patch DELETED ---


--- lyx-1.6.5-xdg_open.patch DELETED ---