fix build failture

This commit is contained in:
Than Ngo 2013-03-07 18:37:57 +01:00
parent 9362198c21
commit 3667e1bc9c
2 changed files with 19 additions and 1 deletions

View File

@ -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"

View File

@ -21,7 +21,7 @@
Summary: KDE 3 Libraries
Name: kdelibs3
Version: 3.5.10
Release: 47%{?dist}
Release: 48%{?dist}
License: LGPLv2
Url: http://www.kde.org/
@ -68,6 +68,8 @@ Patch56: kdelibs-3.5.10-qcolor_gcc_ftbfs.patch
Patch57: kdelibs-3.5.10-cups-util-missing-header.patch
# remove flawed and obsolete automake version check in admin/cvs.sh
Patch58: kdelibs-3.5.10-automake-version.patch
# fix build failure with automake-1.13
Patch59: kdelibs-3.5.10-automake-missing.patch
# use /etc/kde in addition to /usr/share/config, borrowed from debian
Patch100: kdelibs-3.5.5-kstandarddirs.patch
@ -239,6 +241,7 @@ format for easy browsing
%patch56 -p1 -b .qcolor_gcc_ftbfs
%patch57 -p1 -b .cups-util
%patch58 -p1 -b .automake-version
%patch59 -p1 -b .automake-1.13
%patch100 -p1 -b .kstandarddirs
%patch101 -p1 -b .libtool-shlibext
@ -574,6 +577,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%changelog
* Thu Mar 07 2013 Than Ngo <than@redhat.com> - 3.5.10-48
- fix build failture
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild