diff --git a/lyx.spec b/lyx.spec index 85fd578..8ff1039 100644 --- a/lyx.spec +++ b/lyx.spec @@ -21,9 +21,7 @@ Name: lyx BuildRequires: autoconf BuildRequires: automake BuildRequires: bc -%if %{?suse_version} <1330 BuildRequires: boost-devel -%endif BuildRequires: enchant-devel BuildRequires: fdupes BuildRequires: file-devel @@ -46,9 +44,8 @@ Source3: ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/lyx-%{version}.tar.xz.sig # This was rejected by upstream (http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg133878.html) Patch0: lyx-2.1.2-xdg_open.patch Patch1: lyx-2.1.2.2-remove-date-time.patch -# PATCH-FIX-UPSTREAM backported fix for switch to gcc5 (will be part of 2.1.4) +# The following patches are from the 2.1.x branch, fixes build with gcc5 Patch2: Fix-build-with-GNU-libstdc++-C++11-ABI.patch -# PATCH-FIX-UPSTREAM build with automake 15 (fixed in 2.1.4) Patch3: Automake-15.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: ImageMagick @@ -125,9 +122,7 @@ document under "Help" on the menubar. ./autogen.sh TEXMF=%{_datadir}/texmf %configure \ -%if %{?suse_version} < 1330 --without-included-boost \ -%endif --without-aspell \ --with-hunspell \ --with-enchant