[kdelibs/f15] upstream kdoctools/docbook patch (#690124)
Rex Dieter
rdieter at fedoraproject.org
Mon Jun 27 14:56:02 UTC 2011
commit 82ae0f29cc82efe4979b28575c99d4c390a08658
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon Jun 27 10:00:44 2011 -0500
upstream kdoctools/docbook patch (#690124)
kdelibs-4.6.4-kdoctools_docbook.patch | 395 +++++++++++++++++++++++++++++++++
kdelibs.spec | 8 +-
2 files changed, 402 insertions(+), 1 deletions(-)
---
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 @@
+ <xsl:import href="@DOCBOOKXSL_DIR@/html/chunk.xsl"/>
+
+ <xsl:param name="l10n.xml" select="document('xsl/all-l10n.xml')"/>
+- <xsl:param name="local.l10n.xml" select="document('xsl/kde-custom-l10n.xml')"/>
+-
++ <xsl:param name="local.l10n.xml" select="document(concat('xsl/',/*/@lang,'.xml'))"/>
+ </xsl:stylesheet>
+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 @@
+ <xsl:output method="text" encoding="UTF-8" indent="no"/>
+
+ <xsl:param name="l10n.xml" select="document('xsl/all-l10n.xml')"/>
+- <xsl:param name="local.l10n.xml" select="document('xsl/kde-custom-l10n.xml')"/>
+
+ </xsl:stylesheet>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ca" english-language-name="Catalan">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="ca" english-language-name="Catalan">
+ <l:gentext key="footer-doc-comment" text="Voleu fer un comentari o col·laborar amb una actualització d'aquesta pàgina?"/>
+ <l:gentext key="footer-doc-feedback" text="Envieu els comentaris a "/>
+ <l:gentext key="footer-doc-teamname" text="l'equip de Documentació del KDE"/>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="de" english-language-name="German">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="de" english-language-name="German">
+ <l:gentext key="footer-doc-comment" text="Möchten Sie Kommentare und Verbesserungen zu dieser Seite beitragen?"/>
+ <l:gentext key="footer-doc-feedback" text="Senden Sie Ihre Vorschläge an das "/>
+ <l:gentext key="footer-doc-teamname" text="KDE Dokumentationsteam"/>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="el" english-language-name="Greek">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="el" english-language-name="Greek">
+
+ <l:gentext key="footer-doc-comment" text="Επιθυμείτε να κάνετε ένα σχόλιο ή να συνεισφέρετε στο περιεχόμενο αυτής της σελίδας;"/>
+ <l:gentext key="footer-doc-feedback" text="Στείλτε τις συνεισφορές σας στην "/>
+@@ -53,3 +53,4 @@
+ <l:template name="Sun" text="Κυρ"/>
+ </l:context>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en" english-language-name="English">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="en" english-language-name="English">
+
+ <l:gentext key="nav-home" text="Contents"/>
+
+@@ -7,3 +7,4 @@
+ <l:gentext key="footer-doc-feedback" text="Send feedback to the "/>
+ <l:gentext key="footer-doc-teamname" text="KDE Docs Team"/>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="es" english-language-name="Spanish">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="es" english-language-name="Spanish">
+ <l:gentext key="footer-doc-comment" text="¿Le gustaría hacer algún comentario o aportar una actualización a esta página?"/>
+ <l:gentext key="footer-doc-feedback" text="Envíe sus comentarios al "/>
+ <l:gentext key="footer-doc-teamname" text="equipo de documentación de KDE"/>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="et" english-language-name="Estonian">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="et" english-language-name="Estonian">
+ <l:gentext key="RevHistory" text="Versioonide ajalugu"/>
+ <l:gentext key="revhistory" text="Versioonide ajalugu"/>
+ <l:gentext key="revision" text="Versioon"/>
+@@ -9,3 +9,4 @@
+ <l:gentext key="footer-doc-feedback" text="Saada oma tagasiside "/>
+ <l:gentext key="footer-doc-teamname" text="KDE dokumentatsiooni meeskonnale"/>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="fr" english-language-name="French">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="fr" english-language-name="French">
+ <l:gentext key="footer-doc-comment" text="Vous souhaitez faire un commentaire ou participer au contenu de cette page ?"/>
+ <l:gentext key="footer-doc-feedback" text="Envoyez vos contributions à l'"/>
+ <l:gentext key="footer-doc-teamname" text="équipe de documentation de KDE"/>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="gl" english-language-name="Galician">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="gl" english-language-name="Galician">
+ <l:gentext key="footer-doc-comment" text="Desexa facer un comentario ou actualizar esta páxina?"/>
+ <l:gentext key="footer-doc-feedback" text="Envíe as súas aportacións á "/>
+ <l:gentext key="footer-doc-teamname" text="Equipa de documentación de KDE"/>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="it" english-language-name="Italian">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="it" english-language-name="Italian">
+ <l:dingbat key="startquote" text="«"/>
+ <l:dingbat key="endquote" text="»"/>
+ <l:dingbat key="nestedstartquote" text="“"/>
+@@ -46,3 +46,4 @@
+ <l:template name="table" text="Tabella %n, «%t»"/>
+ </l:context>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="lt" english-language-name="Lithuanian">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="lt" english-language-name="Lithuanian">
+ <l:gentext key="footer-doc-comment" text="Ar norėtumėte pakomentuoti ar atnaujinti šį puslapį?"/>
+ <l:gentext key="footer-doc-feedback" text="Atsiliepimus siųskite "/>
+ <l:gentext key="footer-doc-teamname" text="KDE dokumentacijos komanda"/>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="nl" english-language-name="Dutch">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="nl" english-language-name="Dutch">
+ <l:gentext key="footer-doc-comment" text="Wilt u een opmerking maken of een bijdragen leveren aan deze pagina?"/>
+ <l:gentext key="footer-doc-feedback" text="Stuur uw bericht aan het "/>
+ <l:gentext key="footer-doc-teamname" text="KDE Documentatieteam"/>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="nn" english-language-name="Norwegian Nynorsk">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="nn" english-language-name="Norwegian Nynorsk">
+
+ <l:gentext key="abstract" text="samandrag"/>
+ <l:gentext key="Bibliography" text="Litteratur"/>
+@@ -200,3 +200,4 @@
+ </l:context>
+
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pl" english-language-name="Polish">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="pl" english-language-name="Polish">
+ <l:gentext key="footer-doc-comment" text="Jeśli chcesz skomentować tą stronę lub ją uaktualnić "/>
+ <l:gentext key="footer-doc-feedback" text="Wyślij swoje uwagi (po angielsku) do "/>
+ <l:gentext key="footer-doc-teamname" text="Zespołu dokumentacji KDE"/>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pt_br" english-language-name="Portuguese (Brazil)">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="pt_br" english-language-name="Portuguese (Brazil)">
+ <l:gentext key="footer-doc-comment" text="Gostaria de fazer um comentário ou contribuir com uma atualização para esta página?"/>
+ <l:gentext key="footer-doc-feedback" text="Envie uma mensagem para a "/>
+ <l:gentext key="footer-doc-teamname" text="Equipe de Documentação do KDE"/>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pt" english-language-name="Portuguese">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="pt" english-language-name="Portuguese">
+ <l:gentext key="footer-doc-comment" text="Would you like to make a comment or contribute an update to this page?"/>
+ <l:gentext key="footer-doc-feedback" text="Send feedback to the "/>
+ <l:gentext key="footer-doc-teamname" text="KDE Docs Team"/>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ru" english-language-name="Russian">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="ru" english-language-name="Russian">
+ <l:gentext key="footer-doc-comment" text="Вам есть что добавить на эту страницу?"/>
+ <l:gentext key="footer-doc-feedback" text="Напишите "/>
+ <l:gentext key="footer-doc-teamname" text="команде документации KDE"/>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sl" english-language-name="Slovenian">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="sl" english-language-name="Slovenian">
+
+ <l:gentext key="PubDate" text="Datum objave"/>
+ <l:gentext key="pubdate" text="Datum objave"/>
+@@ -119,3 +119,4 @@
+ </l:context>
+
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
+- language="sr"
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="sr"
+ english-language-name="Serbian">
+
+ <l:gentext key="Abstract" text="Сажетак"/>
+@@ -692,3 +691,4 @@
+ <l:l i="56">z</l:l>
+ </l:letters>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sv" english-language-name="Swedish">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="sv" english-language-name="Swedish">
+ <l:gentext key="footer-doc-comment" text="Vill du ge en kommentar eller bidra med en uppdatering av den här sidan?"/>
+ <l:gentext key="footer-doc-feedback" text="Skicka dina förslag till "/>
+ <l:gentext key="footer-doc-teamname" text="KDE:s dokumentationsgrupp"/>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="tr" english-language-name="Turkish">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="tr" english-language-name="Turkish">
+ <l:gentext key="footer-doc-comment" text="Bu sayfa hakkında bir yorum yapmak ya da katkıda bulunmak ister misniz?"/>
+ <l:gentext key="footer-doc-feedback" text="Geribildirimlerinizi gönderin "/>
+ <l:gentext key="footer-doc-teamname" text="KDE Belgelendirme Ekibi"/>
+ </l:l10n>
++</l:i18n>
+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 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="uk" english-language-name="Ukranian">
++<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
++<l:l10n language="uk" english-language-name="Ukranian">
+
+ <l:gentext key="Bibliography" text="Література"/>
+ <l:gentext key="bibliography" text="література"/>
+@@ -33,3 +33,4 @@
+ <l:gentext key="footer-doc-teamname" text="Команди з документування KDE"/>
+
+ </l:l10n>
++</l:i18n>
+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 << "<?xml version='1.0'?>" << endl;
++ outStream << QString( "<!DOCTYPE l:i18n SYSTEM \"%1\">" )
++ .arg( dtdPath ) << endl;
++
++ if ( langMap.size() > 0 ) {
++ outStream
++ << "<l:i18n xmlns:l=\"http://docbook.sourceforge.net/xmlns/l10n/1.0\">"
++ << endl;
++ LangListType::const_iterator i = langMap.constBegin();
++ while ( i != langMap.constEnd() ) {
++ outStream << QString( "<l:l10n language=\"%1\" href=\"%2\"/>" )
++ .arg( (*i).first ).arg( (*i).second ) << endl;
++ ++i;
++ }
++ outStream << "</l:i18n>" << 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 <rdieter at fedoraproject.org> 4.6.4-4
+- upstream kdoctools/docbook patch (#690124)
+
* Thu Jun 16 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.4-3
- fix KConfigXT KComboBox for Qt 4.8 TP1 (upstream patch)
More information about the scm-commits
mailing list