Hello community, here is the log from the commit of package suse-xsl-stylesheets for openSUSE:Factory checked in at 2015-02-27 10:56:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suse-xsl-stylesheets (Old) and /work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "suse-xsl-stylesheets" Changes: -------- --- /work/SRC/openSUSE:Factory/suse-xsl-stylesheets/suse-xsl-stylesheets.changes 2014-10-01 07:40:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new/suse-xsl-stylesheets.changes 2015-02-27 10:56:42.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 19 13:38:13 UTC 2015 - toms@opensuse.org + +- Slightly adapted %post and %postun section to fix bsc#918565 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suse-xsl-stylesheets.spec ++++++ --- /var/tmp/diff_new_pack.YX2fVU/_old 2015-02-27 10:56:43.000000000 +0100 +++ /var/tmp/diff_new_pack.YX2fVU/_new 2015-02-27 10:56:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package suse-xsl-stylesheets # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -170,15 +170,16 @@ # remove existing entries first - needed for # zypper in, since it does not call postun # delete ... -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{dtdname}-%{dtdversion} -# ... and add it again +if [ "2" = "$1" ]; then + edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ + --del %{dtdname}-%{dtdversion} || true + edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ + --del %{name} || true +fi + +# ... and (re)add it again edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ --add /etc/xml/%{novdoc_catalog} -# delete ... -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{name} -# ... and add it again edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ --add /etc/xml/%{susexsl_catalog} @@ -193,10 +194,9 @@ # only run if package is really uninstalled ($1 = 0) and not # in case of an update # -if [ 0 = $1 ]; then +if [ "0" = "$1" ]; then if [ ! -f %{_sysconfdir}/xml/%{novdoc_catalog} -a -x /usr/bin/edit-xml-catalog ] ; then # SGML: novdoc dtd entry - echo "######################## deleting catalog in postun" %{regcat} -r %{_datadir}/sgml/CATALOG.%{dtdname}-%{dtdversion} >/dev/null 2>&1 || true # XML # novdoc dtd entry -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org