Hello community, here is the log from the commit of package docbook-xsl-stylesheets for openSUSE:Factory checked in at 2013-03-08 13:01:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets (Old) and /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docbook-xsl-stylesheets", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes 2012-06-13 13:10:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes 2013-03-08 13:01:29.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 17 19:41:11 UTC 2013 - [email protected] + +- Updated to 1.78.0, see http://snapshots.docbook.org/xsl/RELEASE-NOTES.html#V1.78.0 + for details (Mostly bugfix release) + +------------------------------------------------------------------- Old: ---- docbook-xsl-1.77.1.tar.bz2 docbook-xsl-doc-1.77.1.tar.bz2 New: ---- docbook-xsl-1.78.0.tar.bz2 docbook-xsl-doc-1.78.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook-xsl-stylesheets.spec ++++++ --- /var/tmp/diff_new_pack.yVVEzJ/_old 2013-03-08 13:01:34.000000000 +0100 +++ /var/tmp/diff_new_pack.yVVEzJ/_new 2013-03-08 13:01:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package docbook-xsl-stylesheets # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -15,8 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define pack_vers 1.77.1 -%define regcat /usr/bin/sgml-register-catalog + +%define dbstyle_dir %{_datadir}/xml/docbook/stylesheet/nwalsh +%define dbstyle_catalog %{name}.xml +%define suse_catalog %{_sysconfdir}/xml/suse-catalog.xml +%define xmlcatalog %{_bindir}/xmlcatalog +%define dbstyle_catalog_entry for-catalog-%{name}-%{version}.xml Name: docbook-xsl-stylesheets Summary: XSL Stylesheets for DocBook 4 @@ -26,16 +30,18 @@ BuildRequires: sgml-skel BuildRequires: unzip BuildArch: noarch -Requires: xmlcharent docbook_4 -PreReq: sgml-skel %{regcat} /usr/bin/xmlcatalog -Version: 1.77.1 +Requires: docbook_4 +Requires: xmlcharent +PreReq: sgml-skel %{_bindir}/xmlcatalog +Version: 1.78.0 Release: 0 -Source0: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{pack_vers}.tar.bz2 +Source0: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{version}.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 Url: http://sourceforge.net/projects/docbook/ +#-------------------------------------------------------------------------- %description These are the XSL stylesheets for DocBook XML and "Simplified" DocBook DTDs. Use these stylesheets for documents based on DocBook 4 and @@ -48,187 +54,138 @@ rendering. For more information about XSL, see the XSL page at the W3C: http://www.w3.org/Style/XSL/ -%define INSTALL install -m755 -s -%define INSTALL_DIR install -d -m755 -%define INSTALL_DATA install -m644 -%define INSTALL_SCRIPT install -m755 -%define sgml_dir %{_datadir}/sgml -%define sgml_var_dir /var/lib/sgml -%define sgml_mod_dir %{sgml_dir}/docbook -%define sgml_mod_dtd_dir %{sgml_mod_dir}/dtd -%define sgml_mod_custom_dir %{sgml_mod_dir}/custom -%define sgml_mod_style_dir %{sgml_mod_dir}/stylesheet -%define xml_dir %{_datadir}/xml -%define xml_mod_dir %{xml_dir}/docbook -%define xml_mod_dtd_dir %{xml_mod_dir}/dtd -%define xml_mod_custom_dir %{xml_mod_dir}/custom -%define xml_mod_style_dir %{xml_mod_dir}/stylesheet -%define xml_mod_style_prod_dir %{xml_mod_style_dir}/nwalsh -%define sgml_config_dir /var/lib/sgml -%define sgml_sysconf_dir %{_sysconfdir}/sgml -%define xml_config_dir /var/lib/xml -%define xml_sysconf_dir %{_sysconfdir}/xml +#-------------------------------------------------------------------------- %prep -# %%setup -q -n docbook-xsl-%%{pack_vers} -b 10 -%setup -q -n docbook-xsl-%{pack_vers} -b 1 +%setup -q -n docbook-xsl-%{version} -b1 %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 +#-------------------------------------------------------------------------- +%build -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 -# 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 -find . -name '.gitignore' | xargs rm -fr -#x=$(find {lib,html,fo,lib,website,slides/fo,slides/html,roundtrip,manpages}/.[a-zA-Z0-9]* -maxdepth 1 -type f ) -#if [ "$x" != '' ]; then -## rm $x; -# for i in $x; do -# if [ -f $i ]; then -# rm $i -# fi -# done -#fi +# +# Creating catalog entries +# -%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} -$xmlcatbin --noout --create $CATALOG -/usr/bin/xmlcatalog --noout --add "rewriteSystem" \ +# +# /etc/xml/docbook-xsl-stylesheets.xml +# +%{xmlcatalog} --noout --create %{dbstyle_catalog} +%{xmlcatalog} --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/%{version}"; \ - "file://%{xml_mod_style_prod_dir}/%{version}" $CATALOG -/usr/bin/xmlcatalog --noout --add "rewriteURI" \ + "file://%{dbstyle_dir}/%{version}" %{dbstyle_catalog} +%{xmlcatalog} --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/%{version}"; \ - "file://%{xml_mod_style_prod_dir}/%{version}" $CATALOG -/usr/bin/xmlcatalog --noout --add "rewriteSystem" \ + "file://%{dbstyle_dir}/%{version}" %{dbstyle_catalog} +%{xmlcatalog} --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current"; \ - "file://%{xml_mod_style_prod_dir}/%{version}" $CATALOG -/usr/bin/xmlcatalog --noout --add "rewriteURI" \ + "file://%{dbstyle_dir}/%{version}" %{dbstyle_catalog} +%{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 -CATALOG=etc/xml/$CATALOG -rm -f %{FOR_ROOT_CAT}.tmp -$xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp -$xmlcatbin --noout --add "delegateSystem" \ + "file://%{dbstyle_dir}/%{version}" %{dbstyle_catalog} + +# +# temporary file that is added to /etc/xml/suse-catalog.xml +# during post +# +%{xmlcatalog} --noout --create %{dbstyle_catalog_entry} +%{xmlcatalog} --noout --add "delegateSystem" \ "http://docbook.sourceforge.net/release/xsl/"; \ - "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp -# $xmlcatbin --noout --add "delegatePublic" \ -# "-//OASIS//xxx" \ -# "file:///$CATALOG" %%{FOR_ROOT_CAT}.tmp -# Create tag -sed '/<catalog/a\ - <group id="%{name}-%{version}"> -/<\/catalog/i\ - </group>' \ - %{FOR_ROOT_CAT}.tmp > %{FOR_ROOT_CAT} + "file:///etc/xml/%{dbstyle_catalog}" %{dbstyle_catalog_entry} +%__sed -i -e '/<catalog/a\ <group id="%{name}">' \ + -e '/<\/catalog/i\ </group>' %{dbstyle_catalog_entry} +#-------------------------------------------------------------------------- %install -# FIXME: Danger!? -# export NO_BRP_CHECK_BYTECODE_VERSION=true + +# Create directories +%__mkdir_p -m755 %{buildroot}%{_bindir} +%__mkdir_p -m755 %{buildroot}%{dbstyle_dir}/%{version} +%__mkdir_p -m755 %{buildroot}%{_defaultdocdir}/%{name}/html +%__mkdir_p -m755 %{buildroot}%{_sysconfdir}/xml # Install scripts -%{INSTALL_DIR} %{buildroot}%{_bindir} -%{INSTALL_SCRIPT} fo/pdf2index %{buildroot}%{_bindir} -%{INSTALL_SCRIPT} epub/bin/dbtoepub %{buildroot}%{_bindir} -rm fo/pdf2index - -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.xsl $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/%{version} -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* -: >%{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 +%__install -m755 fo/pdf2index %{buildroot}%{_bindir} +%__install -m755 epub/bin/dbtoepub %{buildroot}%{_bindir} + +# VERSION.xsl +%__install -m644 VERSION.xsl %{buildroot}%{dbstyle_dir}/%{version} + +# all the rest is located in subdirectories, exclude some subdirectories with +# stuff not needed +for DIR in $(find -maxdepth 1 -mindepth 1 -type d \( -name "tools" -o -name "doc" -o -name "docsrc" -o -name "tests" \) -prune -o -type d -print ); do + %__tar c $DIR | (cd %{buildroot}%{dbstyle_dir}/%{version}; %__tar xp); +done +# fixing permission errors from sources +find %{buildroot}%{dbstyle_dir}/%{version} -type f -exec %__chmod 644 {} \; +find %{buildroot}%{dbstyle_dir}/%{version} -type d -exec %__chmod 755 {} \; +%__chmod 755 %{buildroot}%{dbstyle_dir}/%{version}/extensions/xslt.py + +# create current link +# but not for snapshots +# +if ! echo %{S:0} | grep -q snapshot; then + pushd %{buildroot}%{dbstyle_dir} >/dev/null ln -sf %{version} current - echo %{xml_mod_style_prod_dir}/current -# fi popd >/dev/null -} >%{name}_list -%{INSTALL_DIR} $doc_dir -# documentation -for f in README BUGS TODO WhatsNew RELEASE-NOTES.html; do - # On snapshots, WhatsNew is missing - [ -f $f ] && %{INSTALL_DATA} $f $doc_dir/$f -done -# cp -p README.SuSE $doc_dir/README.SuSE +fi + +# install the catalog files # -{ - LANG=C \ - find %{buildroot}%{xml_mod_style_prod_dir}/%{version} \ - -type d \ - -not -path '%{buildroot}%{xml_mod_style_prod_dir}/%{version}/latex*' \ - | sed 's|%{buildroot}|%dir |' - LANG=C \ - find %{buildroot}%{xml_mod_style_prod_dir}/%{version} \ - -type f \ - -not -path '%{buildroot}%{xml_mod_style_prod_dir}/%{version}/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 -# rm -f xsl-stylesheets -# 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 -%{INSTALL_DATA} %{FOR_ROOT_CAT} %{name}.xml $cat_dir -# cleanup -rm -f %{buildroot}%{xml_mod_style_prod_dir}/%{version}/%{name}.xml -cp $cat_dir/%{FOR_ROOT_CAT} \ - %{buildroot}%{xml_mod_style_prod_dir}/%{version}/%{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 +%__install -m644 %{dbstyle_catalog} %{buildroot}%{_sysconfdir}/xml +%__install -m644 %{dbstyle_catalog_entry} %{buildroot}%{_sysconfdir}/xml -%fdupes -s $RPM_BUILD_ROOT +# the docs come last +# +%__tar c -C doc . | (cd %{buildroot}%{_defaultdocdir}/%{name}/html; %__tar xp); +%fdupes -s %{buildroot} +#-------------------------------------------------------------------------- %post -# remove empty dir if present (from ghost) -# also remove dangling symlink -D=usr/share/sgml -rmdir $D/docbkxsl >/dev/null 2>&1 || : -test -L $D/docbkxsl -a ! -e $D/docbkxsl && rm -f $D/docbkxsl -if [ -x /usr/bin/edit-xml-catalog ]; then - edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --add /etc/xml/%{FOR_ROOT_CAT} -fi +# +# XML Catalog entries for daps profiling +# +# remove existing entries first (if existing) - needed for +# zypper in, since it does not call postun +# +# delete ... +%{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} --del %{name} +# ... and add it again +%{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} \ + --add %{_sysconfdir}/xml/%{dbstyle_catalog_entry} +exit 0 + +#-------------------------------------------------------------------------- %postun -# 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} +# +# delete catalog entry for daps profiling +# only run if package is really uninstalled ($1 = 0) and not +# in case of an update +# +if [ 0 = $1 ]; then + if [ -x %{_bindir}/edit-xml-catalog ] ; then + %{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} --del %{name} + fi fi -%files -f %{name}_list +exit 0 + +#-------------------------------------------------------------------------- +%files %defattr(-, root, root) -%config %{_sysconfdir}/xml/%{name}.xml -%config %{_sysconfdir}/xml/%{FOR_ROOT_CAT} -%{_defaultdocdir}/%{name} -%dir %{xml_mod_style_dir} -%dir %{xml_mod_style_prod_dir} -# it is now in the list: -# %%{xml_mod_style_prod_dir}/current + +%dir %{_datadir}/xml/docbook/stylesheet +%dir %{_datadir}/xml/docbook/stylesheet/nwalsh +%dir %{dbstyle_dir}/%{version} + +%config %{_sysconfdir}/xml/*.xml + +%doc BUGS NEWS README RELEASE-NOTES.txt TODO + %{_bindir}/* +%{dbstyle_dir}/current +%{dbstyle_dir}/%{version}/* %changelog ++++++ docbook-xsl-1.77.1.tar.bz2 -> docbook-xsl-1.78.0.tar.bz2 ++++++ ++++ 120871 lines of diff (skipped) ++++++ docbook-xsl-doc-1.77.1.tar.bz2 -> docbook-xsl-doc-1.78.0.tar.bz2 ++++++ ++++ 22217 lines of diff (skipped) ++++++ docbook-xsl-stylesheets-dbtoepub.patch ++++++ --- /var/tmp/diff_new_pack.yVVEzJ/_old 2013-03-08 13:01:37.000000000 +0100 +++ /var/tmp/diff_new_pack.yVVEzJ/_new 2013-03-08 13:01:37.000000000 +0100 @@ -6,7 +6,7 @@ # -v, --verbose Make output verbose. -lib = File.expand_path(File.join(File.dirname(__FILE__), 'lib')) -+lib= '@@EPUBDIR@@/lib' ++lib= '/usr/share/xml/docbook/stylesheet/nwalsh/current/epub/bin/lib' $LOAD_PATH.unshift(lib) if File.exist?(lib) require 'fileutils' -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
