pld branding also to new theme

diff --git a/dokuwiki.spec b/dokuwiki.spec
index a6e456dd08f4e063a92e642043c4882d04bc4e5f..e570138f4ffb747ef98f824a961021800fea703e 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -224,7 +224,8 @@ cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/pld.gif
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons/jude.png
 cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons/asta.png
 
-cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_appdir}/lib/tpl/default/images/button-pld.png
+cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_appdir}/lib/tpl/dokuwiki/images/button-pld.png
+ln $RPM_BUILD_ROOT%{_appdir}/lib/tpl/{dokuwiki,default}/images/button-pld.png
 
 # hardlink identical icons.
 findup -m $RPM_BUILD_ROOT

diff --git a/pld-branding.patch b/pld-branding.patch
index 301475c7e52effb9191c50d003a6844f3f4fc839..e903b6a3b75839a8b135bb91ac8f0b7cba79aebe 100644 (file)
--- a/pld-branding.patch
+++ b/pld-branding.patch
@@ -20,3 +20,14 @@
    <a <?php echo $tgt?> href="http://dokuwiki.org/" title="Driven by DokuWiki"><img src="<?php echo DOKU_TPL; ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a>
  
  <?php
+--- dokuwiki/lib/tpl/dokuwiki/tpl_footer.php~  2012-09-10 18:15:12.000000000 +0300
++++ dokuwiki/lib/tpl/dokuwiki/tpl_footer.php   2012-09-16 18:27:15.717037872 +0300
+@@ -24,6 +24,8 @@
+             src="<?php echo tpl_basedir(); ?>images/button-xhtml.png" width="80" height="15" alt="Valid XHTML 1.0" /></a>
+         <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS" <?php echo $target?>><img
+             src="<?php echo tpl_basedir(); ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a>
++        <a href="http://www.pld-linux.org/" title="PLD Linux" <?php echo $target?>><img
++            src="<?php echo tpl_basedir(); ?>images/button-pld.png" width="80" height="15" alt="PLD Linux" /></a>
+         <a href="http://dokuwiki.org/" title="Driven by DokuWiki" <?php echo $target?>><img
+             src="<?php echo tpl_basedir(); ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a>
+     </div>