[kdebase3] fix build failure with new automake
Than Ngo
than at fedoraproject.org
Thu Mar 7 17:45:59 UTC 2013
commit 82371c58bc9e147c54f46d88f285cc1fbfee4cba
Author: Than Ngo <than at redhat.com>
Date: Thu Mar 7 18:45:32 2013 +0100
fix build failure with new automake
automake-missing.patch | 12 ++++++++++++
kdebase3.spec | 11 ++++++++++-
2 files changed, 22 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/kdebase3.spec b/kdebase3.spec
index 952a9da..135e1a8 100644
--- a/kdebase3.spec
+++ b/kdebase3.spec
@@ -16,7 +16,7 @@
Name: kdebase3
Summary: KDE 3 core files
Version: 3.5.10
-Release: 22%{?dist}
+Release: 23%{?dist}
# programs: GPLv2, libs: LGPLv2
License: GPLv2
@@ -70,6 +70,10 @@ Patch31: kdebase-3.5.10-konsolesu-kdesu.patch
Patch36: kdebase-3.5.9-userdiskmount.patch
# don't link kcm_colors against libkrdb (and don't call runRdb)
Patch37: kdebase-3.5.10-libkrdb_dep.patch
+# fix build failture with automake-1.13
+Patch38: automake-missing.patch
+
+
# http://aseigo.blogspot.com/2008/10/dear-kde3-kdesktop-users.html
Patch100: kdebase-3.5.10-minicli-decimal-comma.patch
Patch101: kdebase-3.5.10-ossl-1.x.patch
@@ -230,6 +234,8 @@ Protocol handlers (KIOslaves) for personal information management, including:
%patch31 -p1 -b .konsolesu-kdesu
%patch36 -p1 -b .userdiskmount
%patch37 -p1 -b .libkrdb_dep
+%patch38 -p1 -b .automake-1.13
+
%patch100 -p1 -b .minicli-decimal-comma
%patch101 -p1 -b .ossl-1.x
%patch102 -p1 -b .autoconf
@@ -746,6 +752,9 @@ fi
%changelog
+* Thu Mar 07 2013 Than Ngo <than at redhat.com> - 3.5.10-23
+- fix build failure with new automake
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list