From f33b81ddc553905fecd2d734ed03b69aa30a504d Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Aug 31 2021 15:28:50 +0000 Subject: Fixed bz#1999506, FTBFS with autoconf-2.7x --- diff --git a/kde3-autoconf-version.patch b/kde3-autoconf-version.patch new file mode 100644 index 0000000..46effe4 --- /dev/null +++ b/kde3-autoconf-version.patch @@ -0,0 +1,21 @@ +diff -up kdebase-3.5.10/admin/cvs.sh.autoconf2.7x kdebase-3.5.10/admin/cvs.sh +--- kdebase-3.5.10/admin/cvs.sh.autoconf2.7x 2021-08-31 15:50:51.033160910 +0200 ++++ kdebase-3.5.10/admin/cvs.sh 2021-08-31 15:54:10.664792794 +0200 +@@ -32,7 +32,7 @@ check_autotool_versions() + required_autoconf_version="2.53 or newer" + AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` + case $AUTOCONF_VERSION in +- Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;; ++ Autoconf* | autoconf* ) : ;; + "" ) + echo "*** AUTOCONF NOT FOUND!." + echo "*** KDE requires autoconf $required_autoconf_version" +@@ -47,7 +47,7 @@ esac + + AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` + case $AUTOHEADER_VERSION in +- Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;; ++ Autoconf* | autoheader* ) : ;; + "" ) + echo "*** AUTOHEADER NOT FOUND!." + echo "*** KDE requires autoheader $required_autoconf_version" diff --git a/kdelibs3.spec b/kdelibs3.spec index 9d86fde..cde5a93 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -18,7 +18,7 @@ Summary: KDE 3 Libraries Name: kdelibs3 Version: 3.5.10 -Release: 111%{?dist} +Release: 112%{?dist} License: LGPLv2 Url: http://www.kde.org/ @@ -168,6 +168,8 @@ Patch302: kde3-automake-add-missing.patch Patch303: kde3-libtool-aarch64.patch # Fix configure bits compromised by LTO optimizations Patch304: kdelibs-3.5.10-configure.patch +# autoconf 2.7x +Patch305: kde3-autoconf-version.patch Requires: ca-certificates Requires: hicolor-icon-theme @@ -362,6 +364,7 @@ This package includes tools kgrantpty and kpac_dhcp_helper. %patch302 -p1 -b .automake-add-missing %patch303 -p1 -b .libtool-aarch64 %patch304 -p1 -b .configure +%patch305 -p1 -b .autoconf2.7x make -f admin/Makefile.common cvs @@ -695,6 +698,9 @@ fi %attr(4755,root,root) %{_bindir}/kpac_dhcp_helper %changelog +* Tue Aug 31 2021 Than Ngo - 3.5.10-112 +- Fixed bz#1999506, FTBFS with autoconf-2.7x + * Thu Jul 22 2021 Fedora Release Engineering - 3.5.10-111 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild