Skip to content

Commit

Permalink
Slightly adapted %post and %postun section to fix bsc#918565
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://svn.code.sf.net/p/daps/svn/trunk/daps@4513 2c1a2506-8097-4b87-b405-3e90b480097b
  • Loading branch information
tomschr committed Feb 19, 2015
1 parent c70dfe4 commit 112d09d
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions packaging/suse-xsl-stylesheets.spec
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,16 @@ fi
# 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 \
if [ "2" = "$1" ]; then
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{dtdname}-%{dtdversion}
# ... and add it again
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{name}
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}

Expand All @@ -192,10 +193,9 @@ exit 0
# 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
Expand Down

0 comments on commit 112d09d

Please sign in to comment.