Hello community, here is the log from the commit of package docbook-xsl-stylesheets for openSUSE:Factory checked in at 2016-07-28 23:44:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets (Old) and /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docbook-xsl-stylesheets" Changes: -------- --- /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes 2016-01-08 15:39:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes 2016-07-28 23:44:40.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 19 11:44:56 UTC 2016 - fv...@suse.com + +- Use update-xml-catalog + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook-xsl-stylesheets.spec ++++++ --- /var/tmp/diff_new_pack.iVt5jN/_old 2016-07-28 23:44:41.000000000 +0200 +++ /var/tmp/diff_new_pack.iVt5jN/_new 2016-07-28 23:44:41.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package docbook-xsl-stylesheets # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,12 +35,14 @@ ## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-dbtoepub.patch Fixed dirname Patch0: %{name}-dbtoepub.patch BuildRequires: fdupes -BuildRequires: sgml-skel +BuildRequires: sgml-skel >= 0.7 BuildRequires: unzip Requires: docbook_4 Requires: xmlcharent Requires(pre): %{_bindir}/xmlcatalog -Requires(pre): sgml-skel +Requires: sgml-skel >= 0.7 +Requires(post): sgml-skel >= 0.7 +Requires(postun): sgml-skel >= 0.7 BuildRoot: %{_tmppath}/%{name}-%{version}-build # BuildRequires: dos2unix BuildArch: noarch @@ -97,7 +99,7 @@ chmod 755 extensions/xslt.py %install - +mkdir -p %{buildroot}%{_sysconfdir}/xml/catalog.d # Should already exist... sh ./dbxslt-install.sh --package-version="%{realversion}" --buildroot=%{buildroot} # fixing permission errors from sources @@ -116,44 +118,15 @@ %fdupes -s %{buildroot} -#-------------------------------------------------------------------------- - %post -# -# XML Catalog entries -# -# remove existing entries first (if existing) - needed for -# zypper in, since it does not call postun -# -# in case of an update, remove old -if [ "2" = "$1" ]; then - %{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} --del %{name} -fi -# ... and (re)add it again -%{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} \ - --add %{_sysconfdir}/xml/%{dbstyle_catalog_entry} - -exit 0 - -#-------------------------------------------------------------------------- +update-xml-catalog %postun -# -# delete catalog entry -# only run if package is really uninstalled ($1 = 0) and not -# in case of an update -# -if [ "0" = "$1" ]; then - %{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} --del %{name} -fi - -exit 0 - -#-------------------------------------------------------------------------- +update-xml-catalog %files %defattr(-, root, root) -%config %{_sysconfdir}/xml/*.xml +%config %{_sysconfdir}/xml/catalog.d/%{name}.xml %doc BUGS NEWS README RELEASE-NOTES.txt TODO %dir %{_datadir}/xml/docbook/stylesheet %dir %{_datadir}/xml/docbook/stylesheet/nwalsh ++++++ dbxslt-install.sh ++++++ --- /var/tmp/diff_new_pack.iVt5jN/_old 2016-07-28 23:44:41.000000000 +0200 +++ /var/tmp/diff_new_pack.iVt5jN/_new 2016-07-28 23:44:41.000000000 +0200 @@ -3,7 +3,7 @@ # Installs the DocBook XSL Stylesheets on openSUSE systems # # Author: Thomas Schraitle -# Copyright (C) 2013 t...@opensuse.org +# Copyright (C) 2016 t...@opensuse.org # # set -x @@ -21,10 +21,10 @@ DATAROOTDIR=share DATADIR=$DATAROOTDIR DOCDIR=$DATAROOTDIR/doc/packages -SYSCONFDIR=/etc +SYSCONFDIR=etc XMLCONFDIR=$SYSCONFDIR/xml XMLDIR=$DATAROOTDIR/xml -DBSTYLE_CATALOG=$PACKAGE.xml +DBSTYLE_CATALOG=catalog.d/$PACKAGE.xml DBSTYLE_DIR=$XMLDIR/docbook/stylesheet/nwalsh ORIG_DBSTYLE_DIR=$PREFIX/$DBSTYLE_DIR @@ -83,7 +83,6 @@ xmldir=$XMLDIR xsltrootdir=$XSLTROOTDIR dbstyle_catalog=$DBSTYLE_CATALOG -dbstyle_catalog_entry=${DBSTYLE_CATALOG_ENTRY} dbstyle_dir=$DBSTYLE_DIR EOF } @@ -191,8 +190,6 @@ XSLTROOTDIR=$PREFIX/$XSLTROOTDIR # XSLTDIR=$PREFIX/$XSLTDIR -DBSTYLE_CATALOG=$PACKAGE.xml -DBSTYLE_CATALOG_ENTRY=for-catalog-${PACKAGE}-${PACKAGE_VERSION}.xml DBSTYLE_DIR=$XMLDIR/docbook/stylesheet/nwalsh printvariables @@ -219,15 +216,6 @@ cp ${DEBUG_SCRIPT:+-v} -a $DBXSLT_DIRS $DBSTYLE_DIR/$PACKAGE_VERSION } - -function create_link() { - my_debug "\n\n=== Create link ===" - - pushd $DBSTYLE_DIR 2>/dev/null - ln -s $PACKAGE_VERSION current - popd -} - function install_scripts() { my_debug "\n\n=== Install scripts ===" @@ -248,7 +236,6 @@ my_debug "\n\n=== Install documentation ===" my_debug " Current dir: $PWD" - for i in "$DBXSLT_DOCFILES"; do cp ${DEBUG_SCRIPT:+-v} -a $i $DOCDIR/$PACKAGE done @@ -258,7 +245,7 @@ function create_dbxslt_catalog() { my_debug "\n\n=== Create catalog file ===" - # /etc/xml/docbook-xsl-stylesheets.xml + # /etc/xml/catalog.d/docbook-xsl-stylesheets.xml xmlcatalog --noout --create $XMLCONFDIR/$DBSTYLE_CATALOG } @@ -277,17 +264,6 @@ xmlcatalog --noout --add "rewriteURI" \ "${DB4_XSLT_URL}current" \ "file://$ORIG_DBSTYLE_DIR/current" $XMLCONFDIR/$DBSTYLE_CATALOG - - # - # temporary file that is added to /etc/xml/suse-catalog.xml - # during post - # - xmlcatalog --noout --create $XMLCONFDIR/${DBSTYLE_CATALOG_ENTRY} - xmlcatalog --noout --add "delegateSystem" \ - "${DB4_XSLT_URL}" \ - "file:///etc/xml/${DBSTYLE_CATALOG}" $XMLCONFDIR/${DBSTYLE_CATALOG_ENTRY} - sed -i -e "/<catalog/a\ <group id=\"${PACKAGE}\">" \ - -e '/<\/catalog/i\ </group>' $XMLCONFDIR/${DBSTYLE_CATALOG_ENTRY} } @@ -315,4 +291,6 @@ create_dbxslt_addentries cleanup_buildroot +my_debug "\n\n=== Finished script." + # EOF