packages: lyx/lyx.spec, lyx/link.patch (REMOVED) - 2.0.0 merged from DEVEL

[arekm]

Author: arekm                        Date: Sun May  8 09:58:04 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 2.0.0 merged from DEVEL

---- Files affected:
packages/lyx:
   lyx.spec (1.156 -> 1.157) , link.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/lyx/lyx.spec
diff -u packages/lyx/lyx.spec:1.156 packages/lyx/lyx.spec:1.157
--- packages/lyx/lyx.spec:1.156	Wed May  4 15:51:27 2011
+++ packages/lyx/lyx.spec	Sun May  8 11:57:59 2011
@@ -9,16 +9,15 @@
 Summary(pl.UTF-8):	Nakładka WYSIWYM na LaTeXa
 Summary(pt_BR.UTF-8):	Editor de Textos para ambiente Desktop
 Name:		lyx
-Version:	1.6.9
-Release:	2
+Version:	2.0.0
+Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		Applications/Publishing/TeX
-Source0:	http://ftp.lyx.org/pub/lyx/stable/1.6.x/%{name}-%{version}.tar.gz
-# Source0-md5:	34de2ca672a0901760aa92d48936f809
+Source0:	http://ftp.lyx.org/pub/lyx/stable/2.0.x/%{name}-%{version}.tar.xz
+# Source0-md5:	005dc04ad01e1b2bd92ec86b6235f8b1
 Source1:	%{name}.desktop
 Source2:	%{name}.png
-Patch0:		link.patch
 URL:		http://www.lyx.org/
 BuildRequires:	QtGui-devel
 BuildRequires:	aiksaurus-devel
@@ -72,7 +71,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 cat config/*.m4 > acinclude.m4
@@ -86,8 +84,7 @@
 	%{?with_system_boost:--without-included-boost} \
 	--without-included-gettext \
 	--with-qt4-dir=%{_libdir}/qt4 \
-	--with-frontend=qt4 \
-	--with-pspell
+	--with-frontend=qt4
 
 %{__make} all
 
@@ -102,7 +99,6 @@
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/lyx/doc/LaTeXConfig.lyx
 ln -sf %{_datadir}/lyx/tex $RPM_BUILD_ROOT%{texmfdir}/tex/latex/lyx
 
 %{__sed} -i -e 's,#! /usr/bin/env python,#!/usr/bin/python,' $RPM_BUILD_ROOT%{_datadir}/lyx/configure.py
@@ -180,6 +176,7 @@
 %{_datadir}/lyx/kbd
 %{_datadir}/lyx/languages
 %{_datadir}/lyx/layouts
+%{_datadir}/lyx/layouttranslations
 %attr(755,root,root) %{_datadir}/lyx/lyx2lyx
 %attr(755,root,root) %{_datadir}/lyx/scripts
 %{_datadir}/lyx/symbols
@@ -198,6 +195,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.157  2011/05/08 09:57:59  arekm
+- 2.0.0 merged from DEVEL
+
 Revision 1.156  2011/05/04 13:51:27  arekm
 - release 2
 
@@ -205,6 +205,23 @@
 - up to 1.6.9
 - use __rm macro, drop obsoleted rm
 - use __sed macro
+
+Revision 1.154.2.5  2011/05/08 09:45:13  arekm
+- up to 2.0.0
+
+Revision 1.154.2.4  2011/04/19 08:44:25  lisu
+- updated to 2.0.0rc3
+
+Revision 1.154.2.3  2011/02/09 09:18:07  lisu
+- update to 2.0.0beta4
+
+Revision 1.154.2.2  2011/01/12 10:15:50  lisu
+- update to 2.0.0beta3
+
+Revision 1.154.2.1  2010/12/09 12:53:52  lisu
+- update to 2.0.0beta2
+- drop obsoleted rm
+- drop obsoleted -link.patch
 
 Revision 1.154  2010/11/16 23:54:57  charles
 - updated to 1.6.8
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lyx/lyx.spec?r1=1.156&r2=1.157&f=u