[packages/kdelibs] - rpm5 vs ccache fix; cvs2git migration fixes

[glen]

commit a442d3df4c5552e55b3b1aabc26792213d765ab5
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Nov 8 15:16:25 2012 +0200

    - rpm5 vs ccache fix; cvs2git migration fixes

 kde-am.patch              |  2 +-
 kdelibs-kate-syntax.patch | 11 -----------
 kdelibs.spec              |  4 ++--
 3 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 11bbb7a..039f990 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -182,8 +182,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # confuses OpenEXR detection
 %undefine	configure_cache
 
-# build broken with spaces in CC
-%undefine	with_ccache
+# kde3 does not work well with ccache (CC with spaces)
+%unglobal      with_ccache
 
 %description
 This package includes libraries that are central to the development
diff --git a/kde-am.patch b/kde-am.patch
index 5a23f3a..bdd9a25 100644
--- a/kde-am.patch
+++ b/kde-am.patch
@@ -5,7 +5,7 @@
      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.10* | automake*1.11*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]*)
      echo "*** $AUTOMAKE_STRING found."
      UNSERMAKE=no
      ;;
diff --git a/kdelibs-kate-syntax.patch b/kdelibs-kate-syntax.patch
index 8a8b3de..830e472 100644
--- a/kdelibs-kate-syntax.patch
+++ b/kdelibs-kate-syntax.patch
@@ -13644,17 +13644,6 @@ diff -urN kdelibs-3.5.8.org/kate/data/html.xml kdelibs-3.5.8/kate/data/html.xml
      <RegExpr attribute="Element" context="El Close" String="</&name;" />
      <!-- as long as kde gives DTDs the text/html mimetype--><IncludeRules context="FindDTDRules" />
      <IncludeRules context="FindEntityRefs" />
-diff -urN kdelibs-3.5.8.org/kate/data/inform.xml kdelibs-3.5.8/kate/data/inform.xml
---- kdelibs-3.5.8.org/kate/data/inform.xml	2005-09-10 10:26:35.000000000 +0200
-+++ kdelibs-3.5.8/kate/data/inform.xml	2006-04-14 21:49:08.000000000 +0200
-@@ -2,7 +2,6 @@
- <!DOCTYPE language SYSTEM "language.dtd">
- <!-- author: Giancarlo Niccolai (giancarlo at niccolai.ws) -->
- <!-- This file is released under GPL license 2.0 or any later version at your choice. -->
--<!-- $Id$ -->
- <language name="Inform" version="1.23" kateversion="2.3" section="Sources" extensions="*.inf;*.h" mimetype="text/x-inform-src" author="Giancarlo Niccolai (giancarlo at niccolai.ws)" license="GPL">
- <highlighting>
-    <list name="keywords">
 diff -urN kdelibs-3.5.8.org/kate/data/javascript.xml kdelibs-3.5.8/kate/data/javascript.xml
 --- kdelibs-3.5.8.org/kate/data/javascript.xml	2005-09-10 10:26:35.000000000 +0200
 +++ kdelibs-3.5.8/kate/data/javascript.xml	2007-10-18 18:00:12.000000000 +0200
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kdelibs.git/commitdiff/62c5d515ab1ccc48ea624256e26cfaa8734e25f0