[koffice-kivio] unify KDE 3 autotools fixes between packages, fixes FTBFS (#914117)

Sat Mar 9 02:24:06 UTC 2013

commit 2e39d02dd34b71dac983a6a5c248bda553915651
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Mar 9 03:23:55 2013 +0100

    unify KDE 3 autotools fixes between packages, fixes FTBFS (#914117)
    
    * Sat Mar 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3:1.6.3-38.trinity.20100511svn
    - unify KDE 3 autotools fixes between packages, fixes FTBFS (#914117)

 kde3-acinclude.patch            |   66 +++++++++++++++++++++++++++++++++++++++
 kde3-automake-add-missing.patch |   12 +++++++
 kde3-automake-version.patch     |   17 ++++++++++
 koffice-kivio.spec              |   26 ++++++++++-----
 4 files changed, 112 insertions(+), 9 deletions(-)
---

diff --git a/kde3-acinclude.patch b/kde3-acinclude.patch
new file mode 100644
index 0000000..0610d6d
--- /dev/null
+++ b/kde3-acinclude.patch
@@ -0,0 +1,66 @@
+2009-12-10  Stepan Kasal  <skasal at redhat.com>
+
+The change of implementation of AC_REQUIRE in 2.64 caused a regression
+in the arts project.
+This can be fixed by shuffling some macro calls.
+
+I suppose that most of this patch will not be needed with a future
+release of Autoconf.
+But the last chunk of this patch is a real bug in this source and
+should go upstream.
+
+--- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
++++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
+@@ -3081,8 +3081,18 @@
+ fi
+ ])
+ 
++AC_DEFUN([AC_CHECK_COMPILERS_CC],
++[ 
++  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
++  CFLAGS=" $CFLAGS"
++  AC_PROG_CC
++  CXXFLAGS=" $CXXFLAGS"
++  AC_PROG_CXX
++])
++
+ AC_DEFUN([AC_CHECK_COMPILERS],
+ [
++  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
+   AC_ARG_ENABLE(debug,
+ 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
+   [
+@@ -3141,11 +3151,6 @@
+     [kde_use_profiling="no"]
+   )
+ 
+-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+-  CFLAGS=" $CFLAGS"
+-
+-  AC_PROG_CC 
+-
+   AC_PROG_CPP
+ 
+   if test "$GCC" = "yes"; then
+@@ -3174,10 +3179,6 @@
+      LDFLAGS=""
+   fi
+ 
+-  CXXFLAGS=" $CXXFLAGS"
+-
+-  AC_PROG_CXX
+-
+   KDE_CHECK_FOR_BAD_COMPILER
+ 
+   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
+@@ -3503,8 +3504,8 @@
+ AC_REQUIRE([AC_LIBTOOL_DLOPEN])
+ AC_REQUIRE([KDE_CHECK_LIB64])
+ 
+-AC_OBJEXT
+-AC_EXEEXT
++AC_REQUIRE([AC_OBJEXT])
++AC_REQUIRE([AC_EXEEXT])
+ 
+ AM_PROG_LIBTOOL
+ AC_LIBTOOL_CXX
diff --git a/kde3-automake-add-missing.patch b/kde3-automake-add-missing.patch
new file mode 100644
index 0000000..9792f70
--- /dev/null
+++ b/kde3-automake-add-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/kde3-automake-version.patch b/kde3-automake-version.patch
new file mode 100644
index 0000000..6ee4e6d
--- /dev/null
+++ b/kde3-automake-version.patch
@@ -0,0 +1,17 @@
+diff -ur kdelibs-3.5.10/admin/cvs.sh kdelibs-3.5.10-automake-version/admin/cvs.sh
+--- kdelibs-3.5.10/admin/cvs.sh	2008-08-19 22:28:39.000000000 +0200
++++ kdelibs-3.5.10-automake-version/admin/cvs.sh	2012-06-12 01:24:13.000000000 +0200
+@@ -63,12 +63,7 @@
+ AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
+ required_automake_version="1.6.1 or newer"
+ case $AUTOMAKE_STRING in
+-  automake*1.5d* | automake*1.5* | automake*1.5-* )
+-    echo "*** YOU'RE USING $AUTOMAKE_STRING."
+-    echo "*** KDE requires automake $required_automake_version"
+-    exit 1
+-    ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++  automake*)
+     echo "*** $AUTOMAKE_STRING found."
+     UNSERMAKE=no
+     ;;
diff --git a/koffice-kivio.spec b/koffice-kivio.spec
index 4f105a2..a0bfb84 100644
--- a/koffice-kivio.spec
+++ b/koffice-kivio.spec
@@ -5,7 +5,7 @@
 Name:           koffice-kivio
 Epoch:          3
 Version:        1.6.3
-Release:        37.trinity.%{svn}svn%{?dist}
+Release:        38.trinity.%{svn}svn%{?dist}
 Summary:        A flowcharting application
 
 Group:          Applications/Productivity
@@ -37,6 +37,14 @@ Patch2:         koffice-trinity-20100511-kivio-desktop.patch
 # build the translations standalone, using the KDE 4 CMake framework
 Patch50:        kivio-translations-20100511-standalone.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
+
 BuildRequires:  kdelibs3-devel
 # See http://bugzilla.redhat.com/244091
 %global kdelibs3_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.10) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
@@ -92,8 +100,6 @@ License:        LGPLv2+
 %patch1 -p1 -b .rename-po
 %patch2 -p1 -b .kivio-desktop
 
-make -f admin/Makefile.common
-
 pushd %{translations}
 %patch50 -p1 -b .standalone
 # rename koffice.po and kofficefilters.po because they conflict with KOffice 2
@@ -110,6 +116,11 @@ popd
 # rename the KOffice README which conflicts with the Kivio one
 mv README README.koffice
 
+%patch300 -p1 -b .acinclude
+%patch301 -p1 -b .automake-version
+%patch302 -p1 -b .automake-add-missing
+make -f admin/Makefile.common cvs
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -125,12 +136,6 @@ echo "pics servicetypes lib kivio filters doc" >inst-apps
   --with-extra-libs=%{_libdir} \
   --disable-final
 
-# workaround various libtool suckage
-cp -f %{_bindir}/libtool libtool
-sed -i 's|^build_old_libs=yes|build_old_libs=no|g' libtool
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
 make %{?_smp_mflags}
 
 pushd %{translations}
@@ -234,6 +239,9 @@ update-desktop-database -q &> /dev/null ||:
 
 
 %changelog
+* Sat Mar 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3:1.6.3-38.trinity.20100511svn
+- unify KDE 3 autotools fixes between packages, fixes FTBFS (#914117)
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3:1.6.3-37.trinity.20100511svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
