[kdewebdev] fix build failure with automake-1.13
Than Ngo
than at fedoraproject.org
Thu Mar 7 19:42:57 UTC 2013
commit cec03494667f99872c6904a903e8535f70c23010
Author: Than Ngo <than at redhat.com>
Date: Thu Mar 7 20:42:43 2013 +0100
fix build failure with automake-1.13
automake-missing.patch | 12 ++++++++++++
kdewebdev.spec | 8 +++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/automake-missing.patch b/automake-missing.patch
new file mode 100644
index 0000000..9792f70
--- /dev/null
+++ b/automake-missing.patch
@@ -0,0 +1,12 @@
+diff -up kdelibs-3.5.10/admin/cvs.sh.me kdelibs-3.5.10/admin/cvs.sh
+--- kdelibs-3.5.10/admin/cvs.sh.me 2013-03-07 18:31:59.415038395 +0100
++++ kdelibs-3.5.10/admin/cvs.sh 2013-03-07 18:32:26.565020369 +0100
+@@ -130,7 +130,7 @@ if egrep "^AM_CONFIG_HEADER" configure.i
+ fi
+
+ echo "*** Creating Makefile templates"
+-$AUTOMAKE || exit 1
++$AUTOMAKE --add-missing || exit 1
+
+ if test "$UNSERMAKE" = no; then
+ echo "*** Postprocessing Makefile templates"
diff --git a/kdewebdev.spec b/kdewebdev.spec
index 28f7f30..7a63605 100644
--- a/kdewebdev.spec
+++ b/kdewebdev.spec
@@ -5,7 +5,7 @@ Name: kdewebdev
Summary: Web development applications
Epoch: 6
Version: 3.5.10
-Release: 16%{?dist}
+Release: 17%{?dist}
License: GPLv2
Url: http://kdewebdev.org/
@@ -27,6 +27,8 @@ Patch3: kdewebdev-3.5.10-fix-freehand-crash.patch
# fixes using a temporary as a lvalue in KafkaPart (FTBFS with g++ 4.6, probably
# silently did the wrong thing before)
Patch4: kdewebdev-3.5.10-gcc46.patch
+# fix build failure with automake-1.13
+Patch5: automake-missing.patch
%if %{make_cvs}
BuildRequires: automake libtool
@@ -88,6 +90,7 @@ Requires: kdelibs3%{?_isa} >= %{version}
%patch2 -p1 -b .autoconf
%patch3 -p1 -b .fix-freehand-crash
%patch4 -p1 -b .gcc46
+%patch5 -p1 -b .automake
install -m644 -p %{SOURCE5} kxsldbg/
@@ -206,6 +209,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Mar 07 2013 Than Ngo <than at redhat.com> - 3.5.10-17
+- fix build failure with automake-1.13
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6:3.5.10-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list