Attachment 912608 Details for Bug 1106724 – git format-patch

[patch] git format-patch

Fix-FTBFS-due-to-automake-114-1106724.patch (text/plain), 2.55 KB, created by Yaakov Selkowitz on 2014-06-26 23:58:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-26 23:58:33 UTC

Size: 2.55 KB

patch

obsolete

>From a1d8dbadda5e9a3d9985581de33ea5f8aaf1d305 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Thu, 26 Jun 2014 18:57:44 -0500
>Subject: [PATCH] Fix FTBFS due to automake-1.14 (#1106724)
>
>---
> grisbi-0.8.9-automake114.patch | 22 ++++++++++++++++++++++
> grisbi.spec                    |  7 ++++++-
> 2 files changed, 28 insertions(+), 1 deletion(-)
> create mode 100644 grisbi-0.8.9-automake114.patch
>
>diff --git a/grisbi-0.8.9-automake114.patch b/grisbi-0.8.9-automake114.patch
>new file mode 100644
>index 0000000..f7cf969
>--- /dev/null
>+++ b/grisbi-0.8.9-automake114.patch
>@@ -0,0 +1,22 @@
>+--- grisbi-0.8.9-orig/configure.in	2011-12-30 14:12:48.000000000 -0600
>++++ grisbi-0.8.9/configure.in	2014-06-11 14:37:54.415710091 -0500
>+@@ -18,6 +18,9 @@ AC_SUBST(GRISBI_MINOR_VERSION, grisbi_mi
>+ AC_DEFINE(GRISBI_MICRO_VERSION, grisbi_micro_version, [grisbi micro version])
>+ AC_SUBST(GRISBI_MICRO_VERSION, grisbi_micro_version)
>+ 
>++AM_INIT_AUTOMAKE([-Wall foreign])
>++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
>++
>+ dnl ================================================================
>+ dnl Standard checks.
>+ dnl ================================================================
>+@@ -33,9 +36,6 @@ AC_PROG_OBJC
>+ dnl Check if we have backtrace support
>+ AC_CHECK_FUNCS(backtrace)
>+ 
>+-AM_INIT_AUTOMAKE([-Wall foreign])
>+-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
>+-
>+ dnl Initialize libtool
>+ LT_INIT
>+ 
>diff --git a/grisbi.spec b/grisbi.spec
>index 1b15713..d398bd6 100644
>--- a/grisbi.spec
>+++ b/grisbi.spec
>@@ -1,6 +1,6 @@
> Name:		grisbi
> Version:	0.8.9
>-Release:	5%{?dist}
>+Release:	6%{?dist}
> Summary:	Personal finances manager
> 
> Group:		Applications/Productivity
>@@ -8,6 +8,7 @@ License:	GPLv2+
> URL:		http://www.grisbi.org
> Source0:	http://downloads.sourceforge.net/project/grisbi/grisbi%20stable/0.8.x/%{name}-%{version}.tar.bz2
> Patch0:     grisbi-dso.patch
>+Patch1: 	grisbi-0.8.9-automake114.patch
> BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:	gtk2-devel, libxml2-devel, glib2-devel, gettext
>@@ -35,6 +36,7 @@ party, nice and easy user interface, user manual, QIF import/export.
> %prep
> %setup -q
> %patch0 -p0 -b .dso
>+%patch1 -p1 -b .automake114
> autoreconf -i
> 
> %build
>@@ -97,6 +99,9 @@ fi
> 
> 
> %changelog
>+* Wed Jun 11 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0.8.9-6
>+- Fix FTBFS due to automake-1.14 (#1106724)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.9-5
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3

Actions: View | Diff

Attachments on bug 1106724: 905131 | 905132 | 905133 | 907854 | 912608