diff --git a/arts-acinclude.patch b/kde3-acinclude.patch similarity index 100% rename from arts-acinclude.patch rename to kde3-acinclude.patch diff --git a/kdelibs-3.5.10-automake-missing.patch b/kde3-automake-add-missing.patch similarity index 100% rename from kdelibs-3.5.10-automake-missing.patch rename to kde3-automake-add-missing.patch diff --git a/kdelibs-3.5.10-automake-version.patch b/kde3-automake-version.patch similarity index 100% rename from kdelibs-3.5.10-automake-version.patch rename to kde3-automake-version.patch diff --git a/kdelibs3.spec b/kdelibs3.spec index 79b7e71..9599e56 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -21,7 +21,7 @@ Summary: KDE 3 Libraries Name: kdelibs3 Version: 3.5.10 -Release: 48%{?dist} +Release: 49%{?dist} License: LGPLv2 Url: http://www.kde.org/ @@ -66,10 +66,6 @@ Patch55: kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch Patch56: kdelibs-3.5.10-qcolor_gcc_ftbfs.patch # fix FTBFS (cups-util.c must include stdio.h, #714133) 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 @@ -83,7 +79,6 @@ Patch106: kdelibs-3.5.10-kio.patch Patch107: kdelibs-3.5.10-assert.patch Patch108: kdelibs-3.5.10-dtoa.patch Patch109: kdelibs-3.5.10-kabc.patch -Patch110: arts-acinclude.patch # kde4.4 backport Patch111: kdelibs-3.5.10-kde-config_kde-version.patch @@ -113,6 +108,14 @@ Patch207: libltdl-CVE-2009-3736.patch # CVE-2011-3365, input validation failure in KSSL Patch208: kdelibs-3.5.x-CVE-2011-3365.patch +## fixes to common KDE 3 autotools machinery +# tweak autoconfigury so that it builds with autoconf 2.64 or 2.65 +Patch300: kde3-acinclude.patch +# remove flawed and obsolete automake version check in admin/cvs.sh +Patch301: kde3-automake-version.patch +# fix build failure with automake 1.13: add the --add-missing flag +Patch302: kde3-automake-add-missing.patch + Requires: hicolor-icon-theme Requires: kde-settings >= 3.5 Requires: kde-filesystem @@ -240,8 +243,6 @@ format for easy browsing %patch55 -p1 -b .latex-syntax %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 @@ -251,11 +252,12 @@ format for easy browsing %patch107 -p1 -b .assert %patch108 -p1 -b .alias %patch109 -p1 -b .kabc -%patch110 -p1 -b .autoconf %patch111 -p1 -b .kde-config_kde-version %patch150 -p1 -b .cups16 +sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h + # security fixes %patch200 -p1 -b .cve-2009-2537 %patch201 -p0 -b .cve-2009-1725 @@ -267,8 +269,9 @@ format for easy browsing %patch207 -p1 -b .CVE-2009-3736 %patch208 -p1 -b .CVE-2011-3365 -sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h - +%patch300 -p1 -b .acinclude +%patch301 -p1 -b .automake-version +%patch302 -p1 -b .automake-add-missing make -f admin/Makefile.common cvs @@ -577,6 +580,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %changelog +* Sat Mar 09 2013 Kevin Kofler - 3.5.10-49 +- unify KDE 3 autotools fixes between packages + * Thu Mar 07 2013 Than Ngo - 3.5.10-48 - fix build failture