diff --git a/kdelibs-4.6.4-kdoctools_docbook.patch b/kdelibs-4.6.4-kdoctools_docbook.patch
new file mode 100644
index 0000000..368fcd9
--- /dev/null
+++ b/kdelibs-4.6.4-kdoctools_docbook.patch
@@ -0,0 +1,395 @@
+diff -up kdelibs-4.6.4/kdoctools/CMakeLists.txt.kdoctools_docbook kdelibs-4.6.4/kdoctools/CMakeLists.txt
+--- kdelibs-4.6.4/kdoctools/CMakeLists.txt.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/CMakeLists.txt 2011-06-27 09:36:41.976238333 -0500
+@@ -217,9 +217,7 @@ add_custom_command( TARGET docbookl10nhe
+ ${DOCBOOKXSL_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/customization/xsl
+ ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl
+ )
+-# all-l10n.xml and kde-custom-l10n.xml are generated by docbookl10nhelper
++# all-l10n.xml is generated by docbookl10nhelper
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl/all-l10n.xml
+ DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2/customization/xsl/ )
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl/kde-custom-l10n.xml
+- DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2/customization/xsl/ )
+
+diff -up kdelibs-4.6.4/kdoctools/customization/kde-include-common.xsl.cmake.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/kde-include-common.xsl.cmake
+--- kdelibs-4.6.4/kdoctools/customization/kde-include-common.xsl.cmake.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/kde-include-common.xsl.cmake 2011-06-27 09:36:41.977238320 -0500
+@@ -5,6 +5,5 @@
+
+
+
+-
+-
++
+
+diff -up kdelibs-4.6.4/kdoctools/customization/kde-include-man.xsl.cmake.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/kde-include-man.xsl.cmake
+--- kdelibs-4.6.4/kdoctools/customization/kde-include-man.xsl.cmake.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/kde-include-man.xsl.cmake 2011-06-27 09:36:41.977238320 -0500
+@@ -7,6 +7,5 @@
+
+
+
+-
+
+
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/ca.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/ca.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/ca.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/ca.xml 2011-06-27 09:36:41.977238320 -0500
+@@ -1,6 +1,7 @@
+-
+-
++
++
+
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/de.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/de.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/de.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/de.xml 2011-06-27 09:36:41.978238308 -0500
+@@ -1,6 +1,7 @@
+-
+-
++
++
+
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/el.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/el.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/el.xml.kdoctools_docbook 2011-04-01 08:56:18.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/el.xml 2011-06-27 09:36:41.978238308 -0500
+@@ -1,5 +1,5 @@
+-
+-
++
++
+
+
+
+@@ -53,3 +53,4 @@
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/en.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/en.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/en.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/en.xml 2011-06-27 09:36:41.978238308 -0500
+@@ -1,5 +1,5 @@
+-
+-
++
++
+
+
+
+@@ -7,3 +7,4 @@
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/es.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/es.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/es.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/es.xml 2011-06-27 09:36:41.978238308 -0500
+@@ -1,6 +1,7 @@
+-
+-
++
++
+
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/et.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/et.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/et.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/et.xml 2011-06-27 09:36:41.978238308 -0500
+@@ -1,5 +1,5 @@
+-
+-
++
++
+
+
+
+@@ -9,3 +9,4 @@
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/fr.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/fr.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/fr.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/fr.xml 2011-06-27 09:36:41.979238296 -0500
+@@ -1,6 +1,7 @@
+-
+-
++
++
+
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/gl.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/gl.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/gl.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/gl.xml 2011-06-27 09:36:41.979238296 -0500
+@@ -1,6 +1,7 @@
+-
+-
++
++
+
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/it.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/it.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/it.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/it.xml 2011-06-27 09:36:41.979238296 -0500
+@@ -1,5 +1,5 @@
+-
+-
++
++
+
+
+
+@@ -46,3 +46,4 @@
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/lt.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/lt.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/lt.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/lt.xml 2011-06-27 09:36:41.979238296 -0500
+@@ -1,6 +1,7 @@
+-
+-
++
++
+
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/nl.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/nl.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/nl.xml.kdoctools_docbook 2011-04-01 08:56:18.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/nl.xml 2011-06-27 09:37:46.817427707 -0500
+@@ -1,5 +1,5 @@
+-
+-
++
++
+
+
+
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/nn.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/nn.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/nn.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/nn.xml 2011-06-27 09:36:41.980238284 -0500
+@@ -1,5 +1,5 @@
+-
+-
++
++
+
+
+
+@@ -200,3 +200,4 @@
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/pl.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/pl.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/pl.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/pl.xml 2011-06-27 09:36:41.980238284 -0500
+@@ -1,6 +1,7 @@
+-
+-
++
++
+
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/pt_br.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/pt_br.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/pt_br.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/pt_br.xml 2011-06-27 09:36:41.981238272 -0500
+@@ -1,6 +1,7 @@
+-
+-
++
++
+
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/pt.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/pt.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/pt.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/pt.xml 2011-06-27 09:36:41.980238284 -0500
+@@ -1,6 +1,7 @@
+-
+-
++
++
+
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/ru.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/ru.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/ru.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/ru.xml 2011-06-27 09:36:41.981238272 -0500
+@@ -1,6 +1,7 @@
+-
+-
++
++
+
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/sl.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/sl.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/sl.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/sl.xml 2011-06-27 09:36:41.981238272 -0500
+@@ -1,5 +1,5 @@
+-
+-
++
++
+
+
+
+@@ -119,3 +119,4 @@
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/sr.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/sr.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/sr.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/sr.xml 2011-06-27 09:36:41.982238259 -0500
+@@ -1,6 +1,5 @@
+-
+-
++
+
+
+@@ -692,3 +691,4 @@
+ z
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/sv.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/sv.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/sv.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/sv.xml 2011-06-27 09:36:41.982238259 -0500
+@@ -1,6 +1,7 @@
+-
+-
++
++
+
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/tr.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/tr.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/tr.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/tr.xml 2011-06-27 09:36:41.982238259 -0500
+@@ -1,6 +1,7 @@
+-
+-
++
++
+
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/customization/xsl/uk.xml.kdoctools_docbook kdelibs-4.6.4/kdoctools/customization/xsl/uk.xml
+--- kdelibs-4.6.4/kdoctools/customization/xsl/uk.xml.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/customization/xsl/uk.xml 2011-06-27 09:36:41.982238259 -0500
+@@ -1,5 +1,5 @@
+-
+-
++
++
+
+
+
+@@ -33,3 +33,4 @@
+
+
+
++
+diff -up kdelibs-4.6.4/kdoctools/docbookl10nhelper.cpp.kdoctools_docbook kdelibs-4.6.4/kdoctools/docbookl10nhelper.cpp
+--- kdelibs-4.6.4/kdoctools/docbookl10nhelper.cpp.kdoctools_docbook 2011-04-01 08:55:50.000000000 -0500
++++ kdelibs-4.6.4/kdoctools/docbookl10nhelper.cpp 2011-06-27 09:36:41.983238246 -0500
+@@ -85,6 +85,39 @@ int writeLangFile( const QString &fname,
+ return( 0 );
+ }
+
++int writeLangFileNew( const QString &fname, const QString &dtdPath,
++ const LangListType &langMap ) {
++
++ QFile outFile( fname );
++ if ( ! outFile.open( QIODevice::WriteOnly ) ) {
++ qCritical() << QString( "Could not write %1" )
++ .arg( outFile.fileName() );
++ return( 1 );
++ }
++
++ QTextStream outStream( &outFile );
++ outStream << "" << endl;
++ outStream << QString( "" )
++ .arg( dtdPath ) << endl;
++
++ if ( langMap.size() > 0 ) {
++ outStream
++ << ""
++ << endl;
++ LangListType::const_iterator i = langMap.constBegin();
++ while ( i != langMap.constEnd() ) {
++ outStream << QString( "" )
++ .arg( (*i).first ).arg( (*i).second ) << endl;
++ ++i;
++ }
++ outStream << "" << endl;
++ }
++
++ outFile.close();
++
++ return( 0 );
++}
++
+ inline const QString addTrailingSlash( const QString &p ) {
+ return p.endsWith( "/" ) ? p : p + "/";
+ }
+@@ -199,11 +232,16 @@ int main( int argc, char **argv ) {
+ ++i;
+ }
+
++ int res = 0;
+
+- int res = writeLangFile( all10nFName, l10nDir + "common/l10n.dtd",
+- allLangs );
+- res += writeLangFile( customl10nFName, l10nDir + "common/l10n.dtd",
+- customLangs );
++ if ( foundRxEntity ) {
++ /* old style (docbook-xsl<=1.75) */
++ res = writeLangFile( all10nFName, l10nDir + "common/l10n.dtd",
++ allLangs );
++ } else {
++ res = writeLangFileNew( all10nFName, l10nDir + "common/l10n.dtd",
++ allLangs );
++ }
+
+ return( res );
+ }
diff --git a/kdelibs.spec b/kdelibs.spec
index 82a232b..fbb4814 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -16,7 +16,7 @@
Summary: KDE Libraries
Version: 4.6.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Name: kdelibs
Epoch: 6
@@ -102,6 +102,8 @@ Patch52: kdelibs-4.6.80-kstatusnotifieritem_dbus_leak.patch
# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/d44186bce4670d2985fb6aba8dba59bbd2c4c77a
# fix KConfigXT KComboBox for Qt 4.8 TP1
Patch100: kdelibs-4.6.80-kconfigxt-qt48.patch
+# fix docbook-style-xsl borkage
+Patch101: kdelibs-4.6.4-kdoctools_docbook.patch
## security fix
# Not Upstreamed? why not ? -- Rex
@@ -290,6 +292,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# 4.6 upstream patches
%patch100 -p1 -b .kconfigxt-qt48
+%patch101 -p1 -b .kdoctools_docbook
# security fix
%patch200 -p1 -b .CVE-2009-2702
@@ -545,6 +548,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Jun 27 2011 Rex Dieter 4.6.4-4
+- upstream kdoctools/docbook patch (#690124)
+
* Thu Jun 16 2011 Rex Dieter 4.6.4-3
- fix KConfigXT KComboBox for Qt 4.8 TP1 (upstream patch)