Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package suse-xsl-stylesheets for 
openSUSE:Factory checked in at 2023-09-06 18:55:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-xsl-stylesheets (Old)
 and      /work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "suse-xsl-stylesheets"

Wed Sep  6 18:55:37 2023 rev:72 rq:1108841 version:2.92.6

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/suse-xsl-stylesheets/suse-xsl-stylesheets.changes    
    2023-08-16 14:16:56.002909087 +0200
+++ 
/work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new.1766/suse-xsl-stylesheets.changes
      2023-09-06 18:56:06.859112065 +0200
@@ -1,0 +2,6 @@
+Mon Aug 28 10:06:42 UTC 2023 - Thomas Schraitle <thomas.schrai...@suse.com> - 
2.92.6
+
+- Update 2.92.6
+  Fix SUSE header to avoid issues with new+old header code #571
+
+-------------------------------------------------------------------

Old:
----
  suse-xsl-2.92.5.tar.bz2

New:
----
  suse-xsl-2.92.6.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ suse-xsl-stylesheets.spec ++++++
--- /var/tmp/diff_new_pack.7wO19Z/_old  2023-09-06 18:56:08.119156983 +0200
+++ /var/tmp/diff_new_pack.7wO19Z/_new  2023-09-06 18:56:08.123157126 +0200
@@ -22,7 +22,7 @@
 %define suse_styles_dir   %{db_xml_dir}/stylesheet
 #
 Name:           suse-xsl-stylesheets
-Version:        2.92.5
+Version:        2.92.6
 Release:        0
 Summary:        SUSE-Branded Stylesheets for DocBook
 License:        GPL-2.0-only OR GPL-3.0-only

++++++ suse-xsl-2.92.5.tar.bz2 -> suse-xsl-2.92.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/suse-xsl-2.92.5/ChangeLog 
new/suse-xsl-2.92.6/ChangeLog
--- old/suse-xsl-2.92.5/ChangeLog       2023-08-15 16:06:36.000000000 +0200
+++ new/suse-xsl-2.92.6/ChangeLog       2023-08-28 12:01:52.000000000 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Thu Aug 28 12:00:00 UTC 2022 - toms...@users.noreply.github.com
+
+- Update 2.92.6
+  Fix SUSE header with xsl:choose and check for $include.suse.header
+  to better distinguish for old and new header (#571)
+
+-------------------------------------------------------------------
 Thu Aug 15 16:04:00 UTC 2022 - toms...@users.noreply.github.com
 
 - Update 2.92.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/suse-xsl-2.92.5/Makefile new/suse-xsl-2.92.6/Makefile
--- old/suse-xsl-2.92.5/Makefile        2023-08-15 16:06:36.000000000 +0200
+++ new/suse-xsl-2.92.6/Makefile        2023-08-28 12:01:52.000000000 +0200
@@ -11,7 +11,7 @@
 
 SHELL         := /bin/bash
 PACKAGE       := suse-xsl-stylesheets
-VERSION       := 2.92.5
+VERSION       := 2.92.6
 CDIR          := $(shell pwd)
 SUSE_XML_PATH := $(PREFIX)/xml/suse
 DB_XML_PATH   := $(PREFIX)/xml/docbook
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/suse-xsl-2.92.5/suse2022-ns/xhtml/chunk-common.xsl 
new/suse-xsl-2.92.6/suse2022-ns/xhtml/chunk-common.xsl
--- old/suse-xsl-2.92.5/suse2022-ns/xhtml/chunk-common.xsl      2023-08-15 
16:06:36.000000000 +0200
+++ new/suse-xsl-2.92.6/suse2022-ns/xhtml/chunk-common.xsl      2023-08-28 
12:01:52.000000000 +0200
@@ -257,23 +257,27 @@
       <body>
         <xsl:call-template name="body.attributes" />
         <xsl:call-template name="outerelement.class.attribute" />
-        <xsl:if test="$include.suse.header">
-          <xsl:variable name="candidate.suse.header.body">
-            <xsl:call-template name="string.subst">
-              <xsl:with-param name="string" select="$include.ssi.body" />
-              <xsl:with-param name="target" select="$placeholder.ssi.language" 
/>
-              <xsl:with-param name="replacement" select="$lang-attr" />
+        <xsl:choose>
+          <xsl:when test="number($include.suse.header) = 1">
+            <xsl:variable name="candidate.suse.header.body">
+              <xsl:call-template name="string.subst">
+                <xsl:with-param name="string" select="$include.ssi.body" />
+                <xsl:with-param name="target" 
select="$placeholder.ssi.language" />
+                <xsl:with-param name="replacement" select="$lang-attr" />
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:text>&#10;</xsl:text>
+            <xsl:comment>#include virtual="<xsl:value-of 
select="$candidate.suse.header.body" />"</xsl:comment>
+            <xsl:text>&#10;</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="bypass">
+              <xsl:with-param name="format" select="'chunk'" />
             </xsl:call-template>
-          </xsl:variable>
-          <xsl:text>&#10;</xsl:text>
-          <xsl:comment>#include virtual="<xsl:value-of 
select="$candidate.suse.header.body" />"</xsl:comment>
-          <xsl:text>&#10;</xsl:text>
-        </xsl:if>
-        <xsl:call-template name="bypass">
-          <xsl:with-param name="format" select="'chunk'" />
-        </xsl:call-template>
 
-        <xsl:call-template name="user.header.content" />
+            <xsl:call-template name="user.header.content" />
+          </xsl:otherwise>
+        </xsl:choose>
 
         <xsl:call-template name="breadcrumbs.navigation" />
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/suse-xsl-2.92.5/suse2022-ns/xhtml/docbook.xsl 
new/suse-xsl-2.92.6/suse2022-ns/xhtml/docbook.xsl
--- old/suse-xsl-2.92.5/suse2022-ns/xhtml/docbook.xsl   2023-08-15 
16:06:36.000000000 +0200
+++ new/suse-xsl-2.92.6/suse2022-ns/xhtml/docbook.xsl   2023-08-28 
12:01:52.000000000 +0200
@@ -755,14 +755,17 @@
         <xsl:call-template name="body.attributes"/>
         <xsl:call-template name="outerelement.class.attribute"/>
 
-        <xsl:if test="$include.suse.header">
-          <xsl:text>&#10;</xsl:text>
-          <xsl:comment>#include virtual="<xsl:value-of 
select="$candidate.suse.header.body"/>"</xsl:comment>
-          <xsl:text>&#10;</xsl:text>
-        </xsl:if>
-        <xsl:call-template name="bypass"/>
-
-        <xsl:call-template name="user.header.content"/>
+        <xsl:choose>
+          <xsl:when test="number($include.suse.header) = 1">
+            <xsl:text>&#10;</xsl:text>
+            <xsl:comment>#include virtual="<xsl:value-of 
select="$candidate.suse.header.body"/>"</xsl:comment>
+            <xsl:text>&#10;</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="bypass" />
+            <xsl:call-template name="user.header.content" />
+          </xsl:otherwise>
+        </xsl:choose>
 
         <xsl:call-template name="breadcrumbs.navigation"/>
 
@@ -915,13 +918,11 @@
       </xsl:call-template>
     </xsl:variable>
 
-      <xsl:if test="$include.suse.header = 0">
-        <header id="_mainnav">
-          <div class="growth-inhibitor">
-            <xsl:call-template name="create.header.logo"/>
-          </div>
-        </header>
-      </xsl:if>
+    <header id="_mainnav">
+      <div class="growth-inhibitor">
+        <xsl:call-template name="create.header.logo" />
+      </div>
+    </header>
   </xsl:template>
 
   <xsl:template name="user.footer.content">

Reply via email to