[contextkit] Workaround automake errors
Jaroslav Reznik
jreznik at fedoraproject.org
Mon Mar 4 10:34:57 UTC 2013
commit 34fa9f853277616e73fa5af8f9e45d579632371b
Author: Jaroslav Reznik <jreznik at redhat.com>
Date: Mon Mar 4 11:34:51 2013 +0100
Workaround automake errors
contextkit-0.5.41-workaround-automake-errors.patch | 19 +++++++++++++++++++
contextkit.spec | 8 +++++++-
2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/contextkit-0.5.41-workaround-automake-errors.patch b/contextkit-0.5.41-workaround-automake-errors.patch
new file mode 100644
index 0000000..a712f5e
--- /dev/null
+++ b/contextkit-0.5.41-workaround-automake-errors.patch
@@ -0,0 +1,19 @@
+diff -up contextkit-0.5.41/configure.ac.workaround-automake-errors contextkit-0.5.41/configure.ac
+--- contextkit-0.5.41/configure.ac.workaround-automake-errors 2012-03-26 15:32:07.000000000 +0200
++++ contextkit-0.5.41/configure.ac 2013-03-04 11:28:09.872792631 +0100
+@@ -2,10 +2,14 @@ AC_PREREQ([2.61])
+ AC_INIT([ContextKit], [0.5.41], [james.thomas at codethink.co.uk], ContextKit)
+
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2 tar-ustar 1.9])
++AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2 tar-ustar 1.9])
+
+ AC_CONFIG_MACRO_DIR([m4])
+
++# for automake 1.2
++m4_pattern_allow([AM_PROG_AR])
++AM_PROG_AR
++
+ AC_PROG_CC
+ CFLAGS="$CXXFLAGS -Wall"
+ AC_PROG_CXX
diff --git a/contextkit.spec b/contextkit.spec
index eb27c28..22f71af 100644
--- a/contextkit.spec
+++ b/contextkit.spec
@@ -1,7 +1,7 @@
Name: contextkit
Summary: Contextual information collection framework
Version: 0.5.41
-Release: 4%{?dist}
+Release: 5%{?dist}
Group: Applications/System
License: LGPLv2
URL: http://gitorious.org/maemo-af/contextkit
@@ -17,6 +17,7 @@ Source0: %{name}-%{version}.tar.bz2
Patch0: remove-docs-build.patch
Patch1: contextkit-gcc45.patch
Patch2: contextkit-0.5.41-gcc47.patch
+Patch3: contextkit-0.5.41-workaround-automake-errors.patch
BuildRequires: dbus-devel
BuildRequires: glib2-devel
BuildRequires: qjson-devel
@@ -63,6 +64,8 @@ Development libraries and headers for building context aware applications.
%patch1 -p1
# fix gcc 47 issues
%patch2 -p1 -b .gcc47
+# workarounds automake errors when warnings are treated as errors
+%patch3 -p1 -b .workaround-automake-errors
# Remove shebang
for file in python/ContextKit/*.py; do
@@ -105,6 +108,9 @@ rm -rf %{buildroot}%{_datadir}/libcontext*-tests
%{_includedir}/context*
%changelog
+* Mon Mar 04 2013 Jaroslav Reznik <jreznik at redhat.com> - 0.5.41-5
+- Workaround automake errors
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.41-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list