rpms/lyx/devel lyx-2.0.0alpha1-xdg_open.patch, NONE, 1.1 .cvsignore, 1.43, 1.44 lyx.spec, 1.109, 1.110 sources, 1.41, 1.42 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
rdieter at fedoraproject.org
Mon Apr 5 15:26:08 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14995
Modified Files:
.cvsignore lyx.spec sources
Added Files:
lyx-2.0.0alpha1-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:
* Sat Apr 03 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.0.0-0.1.alpha1
lyx-2.0.0alpha1-xdg_open.patch:
configure.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE lyx-2.0.0alpha1-xdg_open.patch ---
diff -up lyx-2.0.0alpha1/lib/configure.py.xdg_open lyx-2.0.0alpha1/lib/configure.py
--- lyx-2.0.0alpha1/lib/configure.py.xdg_open 2010-01-07 12:01:35.000000000 -0600
+++ lyx-2.0.0alpha1/lib/configure.py 2010-04-05 10:24:27.030780940 -0500
@@ -459,7 +459,7 @@ def checkFormatEntries(dtl_tools):
checkViewerEditor('a SVG viewer and editor', ['inkscape'],
rc_entry = [r'\Format svg svg SVG "" "%%" "%%" "vector"'])
#
- path, iv = checkViewerNoRC('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'],
+ path, iv = checkViewerNoRC('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'],
rc_entry = [r'''\Format bmp bmp BMP "" "%s" "%s" ""
\Format gif gif GIF "" "%s" "%s" ""
\Format jpg jpg JPEG "" "%s" "%s" ""
@@ -515,7 +515,7 @@ def checkFormatEntries(dtl_tools):
\Format text4 txt "Plain text (catdvi)" "" "" "%%" "document"
\Format textparagraph txt "Plain Text, Join Lines" "" "" "%%" "document"''' ])
#
- path, xhtmlview = checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+ path, xhtmlview = checkViewer('an HTML previewer', ['xdg-open', 'htmlview', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
rc_entry = [r'\Format xhtml xhtml "LyXHTML" X "%%" "" "document"'])
if xhtmlview == "":
addToRC(r'\Format xhtml xhtml "LyXHTML" X "" "" "document"')
@@ -529,18 +529,18 @@ 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', 'kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'],
rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector"
\Format ps ps Postscript t "%%" "" "document,vector"'''])
# 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', \
'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"
\Format pdf4 pdf "PDF (XeTeX)" X "%%" "" "document,vector"'''])
#
- checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'yap', 'dviout -Set=!m'],
+ checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'yap', 'dviout -Set=!m'],
rc_entry = [r'\Format dvi dvi DVI D "%%" "" "document,vector"'])
if dtl_tools:
# Windows only: DraftDVI
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- .cvsignore 18 Mar 2010 13:31:03 -0000 1.43
+++ .cvsignore 5 Apr 2010 15:26:07 -0000 1.44
@@ -1,2 +1 @@
-lyx-1.6.5.tar.bz2
-lyx-1.6.5-autotools.patch.gz
+lyx-2.0.0alpha1.tar.bz2
Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- lyx.spec 18 Mar 2010 13:31:03 -0000 1.109
+++ lyx.spec 5 Apr 2010 15:26:08 -0000 1.110
@@ -1,8 +1,4 @@
-%if 0%{?fedora} > 3
-%define _with_aiksaurus --with-aiksaurus
-%endif
-
%if 0%{?fedora} > 9
%define build_noarch BuildArch: noarch
%endif
@@ -19,10 +15,12 @@ BuildRequires: fontpackages-devel
%define _without_included_boost --without-included-boost
+%define pre alpha1
+
Summary: WYSIWYM (What You See Is What You Mean) document processor
Name: lyx
-Version: 1.6.5
-Release: 5%{?dist}
+Version: 2.0.0
+Release: 0.1.%{pre}%{?dist}
License: GPLv2+
Group: Applications/Publishing
@@ -31,38 +29,23 @@ Url: http://www.lyx.org/
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
-## 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
-
Source1: lyxrc.dist
-
Source10: lyx.desktop
+## upstreamable patches
+# submittee, but upstream rejected it. we currently agree to disagree.
+Patch50: lyx-2.0.0alpha1-xdg_open.patch
+
%if 0%{?autotools}
BuildRequires: automake libtool
%endif
-%if 0%{?_with_aiksaurus:1}
-BuildRequires: aiksaurus-devel
-%endif
BuildRequires: enchant-devel automake libtool
%if 0%{?_without_included_boost:1}
BuildRequires: boost-devel
%endif
BuildRequires: desktop-file-utils
BuildRequires: gettext
+BuildRequires: hunspell-devel
BuildRequires: python
BuildRequires: qt4-devel
BuildRequires: zlib-devel
@@ -162,40 +145,26 @@ A collection of Math symbol fonts for %{
%setup -q -n %{name}-%{version}%{?pre}
-%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
+%patch50 -p1 -b .xdg_open
%build
# debugging fun
-#LDFLAGS="$LDFLAGS -Wl,--as-needed"
+LDFLAGS="$LDFLAGS -Wl,--as-needed"
#LDFLAGS="$LDFLAGS -Wl,--no-add-needed"
-#export LDFLAGS
+export LDFLAGS
%configure \
--disable-dependency-tracking \
--disable-rpath \
--enable-build-type=release \
--enable-optimization="%{optflags}" \
+ --without-included-boost \
--with-enchant \
- --with-qt4-dir=`pkg-config --variable=prefix QtCore` \
- %{?_with_aiksaurus} \
- %{?_without_included_boost}
+ --with-hunspell
-make %{?_smp_mflags} X_LIBS=-lX11
+make %{?_smp_mflags}
%install
@@ -306,6 +275,8 @@ fc-cache %{_fontdir} 2> /dev/null ||:
%changelog
+* Sat Apr 03 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.0.0-0.1.alpha1
+
* 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/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources 18 Mar 2010 13:31:03 -0000 1.41
+++ sources 5 Apr 2010 15:26:08 -0000 1.42
@@ -1,2 +1 @@
-35a10d8cb8e4bdd296092d9d981330c9 lyx-1.6.5.tar.bz2
-9293b9b87ca169eee65b32d115ae3e41 lyx-1.6.5-autotools.patch.gz
+faf938409d693dd0ff3b0e56b9bc407b lyx-2.0.0alpha1.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 ---
More information about the scm-commits
mailing list