- standard KDE workground of cvs.sh and autoconf 2.6 stuff

- fixes build (copied from kde-ac260-lt.patch)

Changed files:
    kaffeine-ac260.patch -> 1.1

diff --git a/kaffeine-ac260.patch b/kaffeine-ac260.patch
new file mode 100644 (file)
index 0000000..49dd659
--- /dev/null
+++ b/kaffeine-ac260.patch
@@ -0,0 +1,42 @@
+diff -urN kaffeine-0.8.2/admin/cvs.sh kaffeine-0.8.2.new/admin/cvs.sh
+--- kaffeine-0.8.2/admin/cvs.sh        2006-03-05 12:52:36.000000000 +0100
++++ kaffeine-0.8.2.new/admin/cvs.sh    2006-11-10 13:14:50.986633750 +0100
+@@ -32,7 +32,7 @@
+ 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.[56]* | autoconf*2.[56]* ) : ;;
+   "" )
+     echo "*** AUTOCONF NOT FOUND!."
+     echo "*** KDE requires autoconf $required_autoconf_version"
+@@ -47,7 +47,7 @@
+ 
+ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+ case $AUTOHEADER_VERSION in
+-  Autoconf*2.5* | autoheader*2.5* ) : ;;
++  Autoconf*2.[56]* | autoheader*2.[56]* ) : ;;
+   "" )
+     echo "*** AUTOHEADER NOT FOUND!."
+     echo "*** KDE requires autoheader $required_autoconf_version"
+@@ -68,7 +68,7 @@
+     echo "*** KDE requires automake $required_automake_version"
+     exit 1
+     ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
+     echo "*** $AUTOMAKE_STRING found."
+     UNSERMAKE=no
+     ;;
+diff -urN kaffeine-0.8.2/admin/libtool.m4.in kaffeine-0.8.2.new/admin/libtool.m4.in
+--- kaffeine-0.8.2/admin/libtool.m4.in 2005-12-18 01:19:11.000000000 +0100
++++ kaffeine-0.8.2.new/admin/libtool.m4.in     2006-11-10 13:15:24.536730500 +0100
+@@ -3542,7 +3542,7 @@
+   # The `*' in the case matches for architectures that use `case' in
+   # $output_verbose_cmd can trigger glob expansion during the loop
+   # eval without this substitution.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+ 
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in