mcepl pushed to lyx (epel7). "allow automake-1.5"

[notifications at fedoraproject.org]

From ab8e7070b8d1e4009a310591c13967c427f3bdfe Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 18 May 2015 13:06:46 -0500
Subject: allow automake-1.5


diff --git a/lyx-2.1.3-automake15.patch b/lyx-2.1.3-automake15.patch
new file mode 100644
index 0000000..47f897c
--- /dev/null
+++ b/lyx-2.1.3-automake15.patch
@@ -0,0 +1,30 @@
+diff -up lyx-2.1.3/autogen.sh.automake15 lyx-2.1.3/autogen.sh
+--- lyx-2.1.3/autogen.sh.automake15	2015-05-18 12:54:19.896333451 -0500
++++ lyx-2.1.3/autogen.sh	2015-05-18 12:45:52.637730166 -0500
+@@ -16,12 +16,12 @@ test "$automake_version" != "" && {
+ }
+ 
+ case $automake_version in
+-    *' '1.[8-9]*|*' '1.1[01234]*)
++    *' '1.[8-9]*|*' '1.1[012345]*)
+ 	;;
+     *)
+ 
+ 	echo "This automake version is not supported by LyX."
+-	echo "LyX only supports automake 1.8 to 1.14."
++	echo "LyX only supports automake 1.8 to 1.15."
+ 	exit 1
+ 	;;
+ esac
+diff -up lyx-2.1.3/configure.ac.automake15 lyx-2.1.3/configure.ac
+--- lyx-2.1.3/configure.ac.automake15	2015-02-07 09:25:07.000000000 -0600
++++ lyx-2.1.3/configure.ac	2015-05-18 12:53:48.408046691 -0500
+@@ -27,7 +27,7 @@ fi
+ AM_MAINTAINER_MODE
+ 
+ save_PACKAGE=$PACKAGE
+-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8])
++AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8 subdir-objects])
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+ PACKAGE=$save_PACKAGE
+ 
diff --git a/lyx.spec b/lyx.spec
index d0337b6..ca3ec0b 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -6,10 +6,10 @@ BuildRequires: fontpackages-devel
 %define _without_included_boost --without-included-boost
 
 # Do we need to rebuild configuration files?
-#if 0%{?fedora} > 22
+%if 0%{?fedora} > 21
 # needed by patch153
 %global autotools 1
-#endif
+%endif
 
 # Trim changelog to a reasonable size
 %global _changelog_trimtime %(date +%s -d "1 year ago")
@@ -33,9 +33,10 @@ Source20: %{fontname}.metainfo.xml
 Patch153: 0153-Fix-build-with-GNU-libstdc-C-11-ABI.patch
 
 ## upstreamable patches
-
 # submitted, but upstream rejected it.  we currently agree to disagree.
 Patch50: lyx-2.1.2-xdg_open.patch
+# support automake-1.5
+Patch51: lyx-2.1.3-automake15.patch
 
 Obsoletes: %{name}-qt < 1.5.0
 Provides:  %{name}-qt = %{version}-%{release}
@@ -154,10 +155,11 @@ A collection of Math symbol fonts for %{name}.
 
 %setup -q -n %{name}-%{version}
 
-%patch153 -p1 -b .0153
 %patch50 -p1 -b .xdg_open
 
 %if 0%{?autotools}
+%patch153 -p1 -b .0153
+%patch51 -p1 -b .automake15
 ./autogen.sh
 %endif
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/lyx.git/commit/?h=epel7&id=ab8e7070b8d1e4009a310591c13967c427f3bdfe