commit docbook-xsl-stylesheets for openSUSE:12.1:Update:Test

Hello community, here is the log from the commit of package docbook-xsl-stylesheets for openSUSE:12.1:Update:Test checked in at 2011-12-14 17:29:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/docbook-xsl-stylesheets (Old) and /work/SRC/openSUSE:12.1:Update:Test/.docbook-xsl-stylesheets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "docbook-xsl-stylesheets", Maintainer is "ke@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes 2011-12-14 17:29:20.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes 2011-12-14 17:29:21.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 11 12:02:37 UTC 2011 - ke@suse.de + +- Downgrade to 1.75.2, but use 1.76.2.1.75.2 as a fake version; + bnc#729815. +- Revert 1.76.1 related changes. + +------------------------------------------------------------------- Old: ---- docbook-xsl-1.76.1.tar.bz2 docbook-xsl-doc-1.76.1.tar.bz2 docbook-xsl-stylesheets-dbtoepub.patch New: ---- chunktoc-fix.patch docbook-xsl-1.75.2.tar.bz2 docbook-xsl-doc-1.75.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook-xsl-stylesheets.spec ++++++ --- /var/tmp/diff_new_pack.NTqXkg/_old 2011-12-14 17:29:23.000000000 +0100 +++ /var/tmp/diff_new_pack.NTqXkg/_new 2011-12-14 17:29:23.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package docbook-xsl-stylesheets +# spec file for package docbook-xsl-stylesheets (Version 1.75.2) # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,6 @@ # -%define pack_vers 1.76.1 -%define regcat /usr/bin/sgml-register-catalog Name: docbook-xsl-stylesheets Summary: XSL Stylesheets for DocBook 4 @@ -26,13 +24,19 @@ Group: Productivity/Publishing/DocBook BuildArch: noarch Requires: xmlcharent docbook_4 +%define regcat /usr/bin/sgml-register-catalog PreReq: sgml-skel %{regcat} /usr/bin/xmlcatalog -Version: 1.76.1 -Release: 1 -Source0: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{pack_vers}.tar.bz2 -Source1: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{version}.tar.bz2 -Patch0: %{name}-dbtoepub.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Summary: XSL Stylesheets for DocBook 4 +# This is a fake version number. When updating to 1.76.2 or later, +# change 1.75.2 to the %%{version} macro again: +Version: 1.76.2.1.75.2 +Release: 3 +Source0: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.75.2.tar.... +Source1: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-1.75.2.... +Patch1: chunktoc-fix.patch +# %define pack_vers snapshot +%define pack_vers 1.75.2 +BuildRoot: %{_tmppath}/%{name}-1.75.2-build Url: http://sourceforge.net/projects/docbook/ %description @@ -71,17 +75,14 @@ %prep # %%setup -q -n docbook-xsl-%%{pack_vers} -b 10 %setup -q -n docbook-xsl-%{pack_vers} -b 1 -%patch0 -p1 - -# mv epub/bin/dbtoepub epub/bin/dbtoepub.tmp -sed -i 's=@@EPUBDIR@@=%{xml_mod_style_prod_dir}/current//epub/bin=' epub/bin/dbtoepub - +%patch1 -p1 # We don't need these scripts: rm -rf install.sh tools/bin/docbook-xsl-update find -type f -exec chmod -x {} \; chmod -R a+rX,g-w,o-w . -chmod -x images/*.{svg,png,gif,tif} images/callouts/*.{svg,png,gif} extensions/docbook.py +chmod -x images/*.{svg,png,gif,tif} images/callouts/*.{svg,png,gif} +[ -r extensions/docbook.py ] && chmod -x extensions/docbook.py # Start cleanup (to avoid warnings for rpmlint [ -f ./extensions/saxon65/dist/saxon65.jar ] && rm -rf ./extensions/saxon65/dist/saxon65.jar [ -f ./extensions/xalan27/dist/xalan27.jar ] && rm -rf ./extensions/xalan27/dist/xalan27.jar @@ -100,21 +101,21 @@ xmlcatbin=/usr/bin/xmlcatalog CATALOG=%{name}.xml # file:///usr/share/sgml/docbook/ = %%{sgml_mod_dir} map it to -# %%{xml_mod_style_prod_dir}/%%{version} +# %{xml_mod_style_prod_dir}/1.75.2 $xmlcatbin --noout --create $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/%{version}" \ - "file://%{xml_mod_style_prod_dir}/%{version}" $CATALOG + "http://docbook.sourceforge.net/release/xsl/1.75.2" \ + "file://%{xml_mod_style_prod_dir}/1.75.2" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/%{version}" \ - "file://%{xml_mod_style_prod_dir}/%{version}" $CATALOG + "http://docbook.sourceforge.net/release/xsl/1.75.2" \ + "file://%{xml_mod_style_prod_dir}/1.75.2" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "file://%{xml_mod_style_prod_dir}/%{version}" $CATALOG + "file://%{xml_mod_style_prod_dir}/1.75.2" $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "file://%{xml_mod_style_prod_dir}/%{version}" $CATALOG -%define FOR_ROOT_CAT for-catalog-%{name}-%{version}.xml + "file://%{xml_mod_style_prod_dir}/1.75.2" $CATALOG +%define FOR_ROOT_CAT for-catalog-%{name}-1.75.2.xml CATALOG=etc/xml/$CATALOG rm -f %{FOR_ROOT_CAT}.tmp $xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp @@ -126,7 +127,7 @@ # "file:///$CATALOG" %%{FOR_ROOT_CAT}.tmp # Create tag sed '/ %{FOR_ROOT_CAT} @@ -134,25 +135,18 @@ %install # FIXME: Danger!? export NO_BRP_CHECK_BYTECODE_VERSION=true - -# Install scripts -%{INSTALL_DIR} %{buildroot}%{_bindir} -%{INSTALL_SCRIPT} fo/pdf2index %{buildroot}%{_bindir} -%{INSTALL_SCRIPT} epub/bin/dbtoepub %{buildroot}%{_bindir} -rm fo/pdf2index epub/bin/dbtoepub - doc_dir=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name} -%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/%{version} -cp -a [[:lower:]]* $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/%{version} -cp -a VERSION $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/%{version} +%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/1.75.2 +cp -a [[:lower:]]* $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/1.75.2 +cp -a VERSION $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/1.75.2 find $RPM_BUILD_ROOT%{xml_mod_style_prod_dir} -type f -name '*.orig' -exec rm -f {} \; -rm -f $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/%{version}/for-catalog* +rm -f $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/1.75.2/for-catalog* : >%{name}_list { pushd $RPM_BUILD_ROOT%{xml_mod_style_prod_dir} >/dev/null # do not create the current link for snapshots # if ! echo %%{S:0} | grep -q snapshot; then - ln -sf %{version} current + ln -sf 1.75.2 current echo %{xml_mod_style_prod_dir}/current # fi popd >/dev/null @@ -167,37 +161,37 @@ # { LANG=C \ - find %{buildroot}%{xml_mod_style_prod_dir}/%{version} \ + find %{buildroot}%{xml_mod_style_prod_dir}/1.75.2 \ -type d \ - -not -path '%{buildroot}%{xml_mod_style_prod_dir}/%{version}/latex*' \ + -not -path '%{buildroot}%{xml_mod_style_prod_dir}/1.75.2/latex*' \ | sed 's|%{buildroot}|%dir |' LANG=C \ - find %{buildroot}%{xml_mod_style_prod_dir}/%{version} \ + find %{buildroot}%{xml_mod_style_prod_dir}/1.75.2 \ -type f \ - -not -path '%{buildroot}%{xml_mod_style_prod_dir}/%{version}/latex*' \ + -not -path '%{buildroot}%{xml_mod_style_prod_dir}/1.75.2/latex*' \ | sed 's|%{buildroot}||' } >> %{_builddir}/%{buildsubdir}/%{name}_list # pushd %%{buildroot}%%{xml_mod_style_prod_dir} # rm -f docbook-xsl -# ln -sf docbook-xsl-stylesheets-%%{version} docbook-xsl +# ln -sf docbook-xsl-stylesheets-1.75.2 docbook-xsl # rm -f xsl-stylesheets -# ln -sf docbook-xsl-stylesheets-%%{version} xsl-stylesheets +# ln -sf docbook-xsl-stylesheets-1.75.2 xsl-stylesheets # rm -f %%{name} -# ln -sf docbook-xsl-stylesheets-%%{version} %%{name} +# ln -sf docbook-xsl-stylesheets-1.75.2 %%{name} # popd cat_dir=%{buildroot}/etc/xml %{INSTALL_DIR} $cat_dir %{INSTALL_DATA} %{FOR_ROOT_CAT} %{name}.xml $cat_dir # cleanup %fdupes $RPM_BUILD_ROOT -rm -f %{buildroot}%{xml_mod_style_prod_dir}/%{version}/%{name}.xml +rm -f %{buildroot}%{xml_mod_style_prod_dir}/1.75.2/%{name}.xml cp $cat_dir/%{FOR_ROOT_CAT} \ - %{buildroot}%{xml_mod_style_prod_dir}/%{version}/%{name}.xml + %{buildroot}%{xml_mod_style_prod_dir}/1.75.2/%{name}.xml chmod +x \ -%{buildroot}%{xml_mod_style_prod_dir}/%{version}/extensions/docbook.py \ -%{buildroot}%{xml_mod_style_prod_dir}/%{version}/extensions/xslt.py -# %%{buildroot}%%{xml_mod_style_prod_dir}/%%{version}/epub/bin/lib/docbook.rb -# %%{buildroot}%%{xml_mod_style_prod_dir}/%%{version}/epub/bin/spec/spec_helper.rb +%{buildroot}%{xml_mod_style_prod_dir}/1.75.2/extensions/docbook.py \ +%{buildroot}%{xml_mod_style_prod_dir}/1.75.2/extensions/xslt.py +# %%{buildroot}%%{xml_mod_style_prod_dir}/1.75.2/epub/bin/lib/docbook.rb +# %%{buildroot}%%{xml_mod_style_prod_dir}/1.75.2/epub/bin/spec/spec_helper.rb %post # remove empty dir if present (from ghost) @@ -214,7 +208,7 @@ # remove entries only on removal of file if [ ! -f %{xml_sysconf_dir}/%{FOR_ROOT_CAT} -a -x /usr/bin/edit-xml-catalog ] ; then edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{name}-%{version} + --del %{name}-1.75.2 fi %files -f %{name}_list @@ -226,6 +220,5 @@ %dir %{xml_mod_style_prod_dir} # it is now in the list: # %%{xml_mod_style_prod_dir}/current -%{_bindir}/* %changelog ++++++ chunktoc-fix.patch ++++++ From: http://docbook.svn.sourceforge.net/viewvc/docbook?view=rev&revision=8534 --- html/chunktoc.xsl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- docbook-xsl-1.75.2.orig/html/chunktoc.xsl +++ docbook-xsl-1.75.2/html/chunktoc.xsl @@ -1,7 +1,10 @@ http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" - version="1.0" - exclude-result-prefixes="doc"> + xmlns:exsl="http://exslt.org/common" + xmlns:ng="http://docbook.org/docbook-ng" + xmlns:db="http://docbook.org/ns/docbook" + version="1.0" + exclude-result-prefixes="doc exsl ng db"> Reply