Hello community, here is the log from the commit of package docbook-xsl-stylesheets for openSUSE:Factory checked in at Fri Apr 22 22:49:55 CEST 2011. -------- --- docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes 2009-12-24 12:02:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes 2011-04-12 13:32:29.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Apr 12 06:30:39 UTC 2011 - toms@suse.de + +- Update to 1.76.1; for news, see + http://lists.oasis-open.org/archives/docbook-apps/201011/msg00007.html +- Moved pdf2index and dbtoepub to /usr/bin +- Cleaned up Spec file to avoid rpmlint warnings +- Removed now obsolete chunktoc-fix.patch + +------------------------------------------------------------------- +Wed Apr 14 12:28:37 CEST 2010 - mmarek@suse.cz + +- chunktoc.xsl: Added missing namespace declarations. Closes + bug #2890069. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- docbook-xsl-1.75.2.tar.bz2 docbook-xsl-doc-1.75.2.tar.bz2 New: ---- docbook-xsl-1.76.1.tar.bz2 docbook-xsl-doc-1.76.1.tar.bz2 docbook-xsl-stylesheets-dbtoepub.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook-xsl-stylesheets.spec ++++++ --- /var/tmp/diff_new_pack.0A0b0T/_old 2011-04-22 22:48:35.000000000 +0200 +++ /var/tmp/diff_new_pack.0A0b0T/_new 2011-04-22 22:48:35.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package docbook-xsl-stylesheets (Version 1.75.2) +# spec file for package docbook-xsl-stylesheets # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -17,23 +17,25 @@ # norootforbuild +%define pack_vers 1.76.1 +%define regcat /usr/bin/sgml-register-catalog Name: docbook-xsl-stylesheets +Summary: XSL Stylesheets for DocBook 4 BuildRequires: fdupes sgml-skel unzip +BuildRequires: ruby License: MPL and X11 Group: Productivity/Publishing/DocBook AutoReqProv: on BuildArch: noarch Requires: xmlcharent docbook_4 -%define regcat /usr/bin/sgml-register-catalog +Requires: ruby PreReq: sgml-skel %{regcat} /usr/bin/xmlcatalog -Summary: XSL Stylesheets for DocBook 4 -Version: 1.75.2 -Release: 3 -Source0: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{version}.tar.bz2 +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 -# %define pack_vers snapshot -%define pack_vers %{version} +Patch0: %{name}-dbtoepub.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://sourceforge.net/projects/docbook/ @@ -59,7 +61,7 @@ %define INSTALL install -m755 -s %define INSTALL_DIR install -d -m755 %define INSTALL_DATA install -m644 -%define INSTALL_SCRIPT install -m755 -o root -g root +%define INSTALL_SCRIPT install -m755 %define sgml_dir %{_datadir}/sgml %define sgml_var_dir /var/lib/sgml %define sgml_mod_dir %{sgml_dir}/docbook @@ -78,16 +80,19 @@ %define xml_sysconf_dir %{_sysconfdir}/xml %prep -# %setup -q -n docbook-xsl-%{pack_vers} -b 10 +# %%setup -q -n docbook-xsl-%%{pack_vers} -b 10 %setup -q -n docbook-xsl-%{pack_vers} -b 1 -### snap -#unzip -a %{S:100} -#cp -a docbook-xsl-snapshot/* . -### snap end -# cp -p %{SOURCE1} README.SuSE -# cp %{S:2} fo +%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 + +# 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} +chmod -x images/*.{svg,png,gif,tif} images/callouts/*.{svg,png,gif} 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 @@ -105,8 +110,8 @@ %build xmlcatbin=/usr/bin/xmlcatalog CATALOG=%{name}.xml -# file:///usr/share/sgml/docbook/ = %{sgml_mod_dir} map it to -# %{xml_mod_style_prod_dir}/%{version} +# file:///usr/share/sgml/docbook/ = %%{sgml_mod_dir} map it to +# %%{xml_mod_style_prod_dir}/%%{version} $xmlcatbin --noout --create $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/%{version}" \ @@ -129,7 +134,7 @@ "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp # $xmlcatbin --noout --add "delegatePublic" \ # "-//OASIS//xxx" \ -# "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp +# "file:///$CATALOG" %%{FOR_ROOT_CAT}.tmp # Create tag sed '/<catalog/a\ <group id="%{name}-%{version}"> @@ -140,6 +145,13 @@ %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} @@ -150,7 +162,7 @@ { 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 +# if ! echo %%{S:0} | grep -q snapshot; then ln -sf %{version} current echo %{xml_mod_style_prod_dir}/current # fi @@ -176,13 +188,13 @@ -not -path '%{buildroot}%{xml_mod_style_prod_dir}/%{version}/latex*' \ | sed 's|%{buildroot}||' } >> %{_builddir}/%{buildsubdir}/%{name}_list -# pushd %{buildroot}%{xml_mod_style_prod_dir} +# pushd %%{buildroot}%%{xml_mod_style_prod_dir} # rm -f docbook-xsl -# ln -sf docbook-xsl-stylesheets-%{version} docbook-xsl +# ln -sf docbook-xsl-stylesheets-%%{version} docbook-xsl # rm -f xsl-stylesheets -# ln -sf docbook-xsl-stylesheets-%{version} xsl-stylesheets -# rm -f %{name} -# ln -sf docbook-xsl-stylesheets-%{version} %{name} +# ln -sf docbook-xsl-stylesheets-%%{version} xsl-stylesheets +# rm -f %%{name} +# ln -sf docbook-xsl-stylesheets-%%{version} %%{name} # popd cat_dir=%{buildroot}/etc/xml %{INSTALL_DIR} $cat_dir @@ -195,8 +207,8 @@ 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}/%%{version}/epub/bin/lib/docbook.rb +# %%{buildroot}%%{xml_mod_style_prod_dir}/%%{version}/epub/bin/spec/spec_helper.rb %post # remove empty dir if present (from ghost) @@ -227,6 +239,7 @@ %dir %{xml_mod_style_dir} %dir %{xml_mod_style_prod_dir} # it is now in the list: -# %{xml_mod_style_prod_dir}/current +# %%{xml_mod_style_prod_dir}/current +%{_bindir}/* %changelog ++++++ docbook-xsl-1.75.2.tar.bz2 -> docbook-xsl-1.76.1.tar.bz2 ++++++ ++++ 122968 lines of diff (skipped) ++++++ docbook-xsl-doc-1.75.2.tar.bz2 -> docbook-xsl-doc-1.76.1.tar.bz2 ++++++ ++++ 20230 lines of diff (skipped) ++++++ docbook-xsl-stylesheets-dbtoepub.patch ++++++ diff -ur docbook-xsl-1.76.1.orig/epub/bin/dbtoepub docbook-xsl-1.76.1/epub/bin/dbtoepub --- docbook-xsl-1.76.1.orig/epub/bin/dbtoepub 2010-09-13 23:59:41.000000000 +0200 +++ docbook-xsl-1.76.1/epub/bin/dbtoepub 2011-04-12 09:43:49.000000000 +0200 @@ -17,7 +17,7 @@ # layer (imports epub/docbook.xsl). # -v, --verbose Make output verbose. -lib = File.expand_path(File.join(File.dirname(__FILE__), 'lib')) +lib= '@@EPUBDIR@@/lib' $LOAD_PATH.unshift(lib) if File.exist?(lib) require 'fileutils' Nur in docbook-xsl-1.76.1/epub/bin: dbtoepub~. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org