RHEL/Fedora: various updates

1 files changed, 11 insertions, 81 deletions

diff --git a/redhat/extras/k3b-i18n/k3b-i18n-trinity.patch b/redhat/extras/k3b-i18n/k3b-i18n-trinity.patch
index 0b85e98cf..dccbfa1ae 100644
--- a/redhat/extras/k3b-i18n/k3b-i18n-trinity.patch
+++ b/redhat/extras/k3b-i18n/k3b-i18n-trinity.patch
@@ -1,81 +1,11 @@
---- k3b-i18n-1.0.5/acinclude.m4.ORI	2011-10-30 11:45:36.484658442 +0100
-+++ k3b-i18n-1.0.5/acinclude.m4	2011-10-30 11:53:00.134646577 +0100
-@@ -479,14 +479,14 @@
-     if test "$kde_qtver" = "2"; then
-       kde_moduledir='\${libdir}/kde2'
-     else
--      kde_moduledir='\${libdir}/kde3'
-+      kde_moduledir='\${libdir}/trinity'
-     fi
-   fi
-   if test -z "$kde_styledir"; then
--    kde_styledir='\${libdir}/kde3/plugins/styles'
-+    kde_styledir='\${libdir}/trinity/plugins/styles'
-   fi
-   if test -z "$kde_widgetdir"; then
--    kde_widgetdir='\${libdir}/kde3/plugins/designer'
-+    kde_widgetdir='\${libdir}/trinity/plugins/designer'
-   fi
-   if test -z "$xdg_appsdir"; then
-     xdg_appsdir='\${datadir}/applications/kde'
-@@ -546,7 +546,7 @@
- 
- AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
- [
--    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-+    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/trinity/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-     test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-     if test -n "$KDEDIRS"; then
-        kde_save_IFS=$IFS
-@@ -612,7 +612,7 @@
-         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
- 
-         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
-- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde3/share /opt/kde/share $prefix/share"
-             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
-             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
- 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
-@@ -1817,7 +1817,7 @@
- 
- if test -z "$1"; then
- 
--kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
- test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
- kde_incdirs="$ac_kde_includes $kde_incdirs"
- AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
-@@ -1829,7 +1829,7 @@
- So, check this please and use another prefix!])
- fi
- 
--kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
- test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
- kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
- AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
-@@ -1837,7 +1837,7 @@
- 
- kde_widgetdir=NO
- dnl this might be somewhere else
--AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
-+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
- 
- if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
- AC_MSG_ERROR([
-@@ -1845,7 +1845,7 @@
- So, check this please and use another prefix!])
- fi
- 
--if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
-+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
- AC_MSG_ERROR([
- I can't find the designer plugins. These are required and should have been installed
- by kdelibs])
-@@ -1852,7 +1852,7 @@
- fi
-
- if test -n "$kde_widgetdir"; then
--    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
-+    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
- fi
+--- k3b-i18n-1.0.5/admin/cvs.sh.ORI	2012-05-09 19:45:56.106421990 +0200
++++ k3b-i18n-1.0.5/admin/cvs.sh	2012-05-09 19:46:16.264708192 +0200
+@@ -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.10*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*)
+     echo "*** $AUTOMAKE_STRING found."
+     UNSERMAKE=no
+     ;;