jreznik pushed to kdelibs3 (epel7). "fix build failture"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 2 15:38:58 UTC 2015
>From 3667e1bc9c3c8bb20fc83a662d863fdb9a02b21a Mon Sep 17 00:00:00 2001
From: Than Ngo <than at redhat.com>
Date: Thu, 7 Mar 2013 18:37:57 +0100
Subject: fix build failture
diff --git a/kdelibs-3.5.10-automake-missing.patch b/kdelibs-3.5.10-automake-missing.patch
new file mode 100644
index 0000000..9792f70
--- /dev/null
+++ b/kdelibs-3.5.10-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/kdelibs3.spec b/kdelibs3.spec
index 72e294f..79b7e71 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -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 at redhat.com> - 3.5.10-48
+- fix build failture
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=3667e1bc9c3c8bb20fc83a662d863fdb9a02b21a
More information about the scm-commits
mailing list